Mercurial > public > mercurial-scm > hg-stable
diff mercurial/templatefilters.py @ 31785:654e9a1c8a6c
formatter: use templatefilters.json()
Now _jsonifyobj() is identical to templatefilters.json(paranoid=False).
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 02 Apr 2017 12:02:17 +0900 |
| parents | 47925b63be70 |
| children | a0f2d83f8083 |
line wrap: on
line diff
--- a/mercurial/templatefilters.py Sun Apr 02 11:54:24 2017 +0900 +++ b/mercurial/templatefilters.py Sun Apr 02 12:02:17 2017 +0900 @@ -218,7 +218,7 @@ return "".join(indenter()) @templatefilter('json') -def json(obj): +def json(obj, paranoid=True): if obj is None: return 'null' elif obj is False: @@ -228,7 +228,7 @@ elif isinstance(obj, (int, long, float)): return str(obj) elif isinstance(obj, str): - return '"%s"' % encoding.jsonescape(obj, paranoid=True) + return '"%s"' % encoding.jsonescape(obj, paranoid=paranoid) elif util.safehasattr(obj, 'keys'): out = ['%s: %s' % (json(k), json(v)) for k, v in sorted(obj.iteritems())]