From b32512ed9a1ab9912a9e0bdbb609ca1a19949355 Mon Sep 17 00:00:00 2001
From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 29 Nov 2012 02:25:03 +0200
Subject: [PATCH] #16476: Fix json.tool to avoid including trailing whitespace.

---
 Lib/json/tool.py                 |  3 ++-
 Lib/test/json_tests/test_tool.py | 16 ++++++++--------
 Misc/NEWS                        |  2 ++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Lib/json/tool.py b/Lib/json/tool.py
index 9ab6d6546a8..0f108c6dae4 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 8a3cc6f77f5..1f2c8a24420 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 48c5111a90b..39eed910792 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.