diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-29 00:26:15 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-29 00:26:15 (GMT) |
| commit | 4cee810f5d0376ba32f893340e9a5fefc1b56e05 (patch) | |
| tree | 2ac8554fdd8c04db0ef7b51686de4895e377d083 | |
| parent | 1e86d01e1ebca5554c51d18dee404658c14bce00 (diff) | |
| parent | b32512ed9a1ab9912a9e0bdbb609ca1a19949355 (diff) | |
| download | cpython-4cee810f5d0376ba32f893340e9a5fefc1b56e05.zip cpython-4cee810f5d0376ba32f893340e9a5fefc1b56e05.tar.gz cpython-4cee810f5d0376ba32f893340e9a5fefc1b56e05.tar.bz2 | |
#16476: merge with 3.2.
| -rw-r--r-- | Lib/json/tool.py | 3 | ||||
| -rw-r--r-- | Lib/test/json_tests/test_tool.py | 16 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/Lib/json/tool.py b/Lib/json/tool.py index 9ab6d65..0f108c6 100644 --- a/Lib/json/tool.py +++ b/Lib/json/tool.py @@ -31,7 +31,8 @@ def main(): except ValueError as e: raise SystemExit(e) with outfile: - json.dump(obj, outfile, sort_keys=True, indent=4) + json.dump(obj, outfile, sort_keys=True, + indent=4, separators=(',', ': ')) outfile.write('\n') diff --git a/Lib/test/json_tests/test_tool.py b/Lib/test/json_tests/test_tool.py index 8a3cc6f..1f2c8a2 100644 --- a/Lib/test/json_tests/test_tool.py +++ b/Lib/test/json_tests/test_tool.py @@ -19,19 +19,19 @@ class TestTool(unittest.TestCase): [ [ "blorpie" - ], + ], [ "whoops" - ], - [], - "d-shtaeou", - "d-nthiouh", - "i-vhbjkhnth", + ], + [], + "d-shtaeou", + "d-nthiouh", + "i-vhbjkhnth", { "nifty": 87 - }, + }, { - "field": "yes", + "field": "yes", "morefield": false } ] @@ -96,6 +96,8 @@ Core and Builtins Library ------- +- Issue #16476: Fix json.tool to avoid including trailing whitespace. + - Issue #16549: Make json.tool work again on Python 3 and add tests. Initial patch by Berker Peksag and Serhiy Storchaka. |