facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity

py3: replace str with bytes in isinstance()

Browse Source
This commit is contained in:
Pulkit Goyal 2017-04-20 19:57:16 +05:30
parent c5fa590c26
commit ce6291f190
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/templatefilters.py
View File

@ -231,7 +231,7 @@ def json(obj, paranoid=True):
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 @@ def stringify(thing):
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 ""