From: INADA Naoki <methane@users.noreply.github.com>
Date: Thu, 25 Jan 2018 10:52:58 +0000 (+0900)
Subject: bpo-32360: Remove OrderedDict usage from json.tool (GH-5315)
X-Git-Tag: v3.7.0b1~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2812d3d99287c50bab99625d7240bcf1c2e32369;p=python

bpo-32360: Remove OrderedDict usage from json.tool (GH-5315)

`object_pairs_hook=OrderedDict` idiom is deprecated.
---

diff --git a/Lib/json/tool.py b/Lib/json/tool.py
index 4f3182c0c1..5932f4ecde 100644
--- a/Lib/json/tool.py
+++ b/Lib/json/tool.py
@@ -11,7 +11,6 @@ Usage::
 
 """
 import argparse
-import collections
 import json
 import sys
 
@@ -34,11 +33,7 @@ def main():
     sort_keys = options.sort_keys
     with infile:
         try:
-            if sort_keys:
-                obj = json.load(infile)
-            else:
-                obj = json.load(infile,
-                                object_pairs_hook=collections.OrderedDict)
+            obj = json.load(infile)
         except ValueError as e:
             raise SystemExit(e)
     with outfile: