From 057bcb4c6c7eef93066002db7ab486f12d50ccee Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Thu, 29 Nov 2012 02:15:18 +0200 Subject: #16549: Make json.tool work again on Python 3 and add tests. Initial patch by Berker Peksag and Serhiy Storchaka. --- Lib/json/tool.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'Lib/json') diff --git a/Lib/json/tool.py b/Lib/json/tool.py index 1adea31dbd..9ab6d6546a 100644 --- a/Lib/json/tool.py +++ b/Lib/json/tool.py @@ -18,19 +18,21 @@ def main(): infile = sys.stdin outfile = sys.stdout elif len(sys.argv) == 2: - infile = open(sys.argv[1], 'rb') + infile = open(sys.argv[1], 'r') outfile = sys.stdout elif len(sys.argv) == 3: - infile = open(sys.argv[1], 'rb') - outfile = open(sys.argv[2], 'wb') + infile = open(sys.argv[1], 'r') + outfile = open(sys.argv[2], 'w') else: raise SystemExit(sys.argv[0] + " [infile [outfile]]") - try: - obj = json.load(infile) - except ValueError as e: - raise SystemExit(e) - json.dump(obj, outfile, sort_keys=True, indent=4) - outfile.write('\n') + with infile: + try: + obj = json.load(infile) + except ValueError as e: + raise SystemExit(e) + with outfile: + json.dump(obj, outfile, sort_keys=True, indent=4) + outfile.write('\n') if __name__ == '__main__': -- cgit v1.2.1