[PATCH 4 of 4] json: pass formatting options recursively
Yuya Nishihara
yuya at tcha.org
Fri Jun 9 10:42:57 EDT 2017
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1497011595 -32400
# Fri Jun 09 21:33:15 2017 +0900
# Node ID 8089aac37fad98442ba210f95f8fec8599dc9f03
# Parent cfed8eb80946df2022a945708a9ae38e02768696
json: pass formatting options recursively
This bug was introduced in 654e9a1c8a6c. It's okay to escape <>, but is
unnecessary for command output.
diff --git a/mercurial/templatefilters.py b/mercurial/templatefilters.py
--- a/mercurial/templatefilters.py
+++ b/mercurial/templatefilters.py
@@ -234,11 +234,12 @@ def json(obj, paranoid=True):
elif isinstance(obj, bytes):
return '"%s"' % encoding.jsonescape(obj, paranoid=paranoid)
elif util.safehasattr(obj, 'keys'):
- out = ['"%s": %s' % (encoding.jsonescape(k, paranoid=paranoid), json(v))
+ out = ['"%s": %s' % (encoding.jsonescape(k, paranoid=paranoid),
+ json(v, paranoid))
for k, v in sorted(obj.iteritems())]
return '{' + ', '.join(out) + '}'
elif util.safehasattr(obj, '__iter__'):
- out = [json(i) for i in obj]
+ out = [json(i, paranoid) for i in obj]
return '[' + ', '.join(out) + ']'
else:
raise TypeError('cannot encode type %s' % obj.__class__.__name__)
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -739,7 +739,7 @@ List of all markers in JSON
{
"date": *, (glob)
"flag": 0,
- "metadata": {"user": "test \u003ctest at example.net\u003e"},
+ "metadata": {"user": "test <test at example.net>"},
"precnode": "cda648ca50f50482b7055c0b0c4c117bba6733d9",
"succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"]
}
More information about the Mercurial-devel
mailing list