#16476: merge with 3.2.

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')
 
 

Lib/test/json_tests/test_tool.py

@@ -19,19 +19,19 @@ class TestTool(unittest.TestCase):
     [
         [
             "blorpie"
-        ], 
+        ],
         [
             "whoops"
-        ], 
+        ],
-        [], 
+        [],
-        "d-shtaeou", 
+        "d-shtaeou",
-        "d-nthiouh", 
+        "d-nthiouh",
-        "i-vhbjkhnth", 
+        "i-vhbjkhnth",
         {
             "nifty": 87
-        }, 
+        },
         {
-            "field": "yes", 
+            "field": "yes",
             "morefield": false
         }
     ]

Misc/NEWS

@@ -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.