--- a/mercurial/templater.py Tue Jun 20 22:11:46 2017 +0530
+++ b/mercurial/templater.py Tue Jun 20 23:46:18 2017 +0530
@@ -1101,7 +1101,7 @@
def _flatten(thing):
'''yield a single stream from a possibly nested set of iterators'''
thing = templatekw.unwraphybrid(thing)
- if isinstance(thing, str):
+ if isinstance(thing, bytes):
yield thing
elif thing is None:
pass
@@ -1110,7 +1110,7 @@
else:
for i in thing:
i = templatekw.unwraphybrid(i)
- if isinstance(i, str):
+ if isinstance(i, bytes):
yield i
elif i is None:
pass