--- a/mercurial/templatekw.py	Wed Jun 21 02:13:34 2017 +0530
+++ b/mercurial/templatekw.py	Wed Jun 21 02:20:34 2017 +0530
@@ -622,7 +622,8 @@
     repo = args['repo']
     ctx = args['ctx']
     pctxs = scmutil.meaningfulparents(repo, ctx)
-    prevs = [str(p.rev()) for p in pctxs]  # ifcontains() needs a list of str
+    # ifcontains() needs a list of str
+    prevs = [pycompat.bytestr(p.rev()) for p in pctxs]
     parents = [[('rev', p.rev()),
                 ('node', p.hex()),
                 ('phase', p.phasestr())]
@@ -651,7 +652,8 @@
     be evaluated"""
     args = pycompat.byteskwargs(args)
     repo = args['ctx'].repo()
-    revs = [str(r) for r in revs]  # ifcontains() needs a list of str
+    # ifcontains() needs a list of str
+    revs = [pycompat.bytestr(r) for r in revs]
     f = _showlist(name, revs, args)
     return _hybrid(f, revs,
                    lambda x: {name: x, 'ctx': repo[int(x)], 'revcache': {}},

--- a/mercurial/templater.py	Wed Jun 21 02:13:34 2017 +0530
+++ b/mercurial/templater.py	Wed Jun 21 02:20:34 2017 +0530
@@ -1106,7 +1106,7 @@
     elif thing is None:
         pass
     elif not util.safehasattr(thing, '__iter__'):
-        yield str(thing)
+        yield pycompat.bytestr(thing)
     else:
         for i in thing:
             i = templatekw.unwraphybrid(i)
@@ -1115,7 +1115,7 @@
             elif i is None:
                 pass
             elif not util.safehasattr(i, '__iter__'):
-                yield str(i)
+                yield pycompat.bytestr(i)
             else:
                 for j in _flatten(i):
                     yield j