Mercurial > public > mercurial-scm > hg

comparison mercurial/templatefilters.py @ 32742:08d0892c93d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
json: avoid extra string manipulation of dict keys A key must be string per JSON spec, and that's also true for template dicts.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 23 Apr 2017 13:40:18 +0900
parents ae0ebe93ac70
children f924dd043974
comparison
equal deleted inserted replaced
32741:8f83f924ee1c 32742:08d0892c93d8
232 elif isinstance(obj, (int, long, float)): 232 elif isinstance(obj, (int, long, float)):
233 return pycompat.bytestr(obj) 233 return pycompat.bytestr(obj)
234 elif isinstance(obj, bytes): 234 elif isinstance(obj, bytes):
235 return '"%s"' % encoding.jsonescape(obj, paranoid=paranoid) 235 return '"%s"' % encoding.jsonescape(obj, paranoid=paranoid)
236 elif util.safehasattr(obj, 'keys'): 236 elif util.safehasattr(obj, 'keys'):
237 out = ['%s: %s' % (json(k), json(v)) 237 out = ['"%s": %s' % (encoding.jsonescape(k, paranoid=paranoid), json(v))
238 for k, v in sorted(obj.iteritems())] 238 for k, v in sorted(obj.iteritems())]
239 return '{' + ', '.join(out) + '}' 239 return '{' + ', '.join(out) + '}'
240 elif util.safehasattr(obj, '__iter__'): 240 elif util.safehasattr(obj, '__iter__'):
241 out = [json(i) for i in obj] 241 out = [json(i) for i in obj]
242 return '[' + ', '.join(out) + ']' 242 return '[' + ', '.join(out) + ']'