diff -r 20ca19e6c74e -r 8779d35c168d mercurial/templater.py
--- 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