--- a/mercurial/templatefilters.py Thu Apr 27 09:49:57 2017 +0530
+++ b/mercurial/templatefilters.py Thu Apr 20 19:57:16 2017 +0530
@@ -231,7 +231,7 @@
return 'true'
elif isinstance(obj, (int, long, float)):
return pycompat.bytestr(obj)
- elif isinstance(obj, str):
+ elif isinstance(obj, bytes):
return '"%s"' % encoding.jsonescape(obj, paranoid=paranoid)
elif util.safehasattr(obj, 'keys'):
out = ['%s: %s' % (json(k), json(v))
@@ -355,7 +355,7 @@
text and concatenating them.
"""
thing = templatekw.unwraphybrid(thing)
- if util.safehasattr(thing, '__iter__') and not isinstance(thing, str):
+ if util.safehasattr(thing, '__iter__') and not isinstance(thing, bytes):
return "".join([stringify(t) for t in thing if t is not None])
if thing is None:
return ""