summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/json/tool.py3
-rw-r--r--Lib/test/json_tests/test_tool.py16
-rw-r--r--Misc/NEWS2
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
}
]
diff --git a/Misc/NEWS b/Misc/NEWS
index 48c5111..39eed91 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -167,6 +167,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.