diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-29 00:18:34 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-29 00:18:34 (GMT) |
| commit | 401cf295e59a9a60ba26a9d5964f31c2c3016285 (patch) | |
| tree | 1998fea1e2ef9c412ebe604befaf4cd2e2affdc0 /Lib/json | |
| parent | d7fed3705909734de38e54a8ac9683a6d96b7e4a (diff) | |
| parent | 1e86d01e1ebca5554c51d18dee404658c14bce00 (diff) | |
| download | cpython-401cf295e59a9a60ba26a9d5964f31c2c3016285.zip cpython-401cf295e59a9a60ba26a9d5964f31c2c3016285.tar.gz cpython-401cf295e59a9a60ba26a9d5964f31c2c3016285.tar.bz2 | |
#16549: merge with 3.3.
Diffstat (limited to 'Lib/json')
| -rw-r--r-- | Lib/json/tool.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Lib/json/tool.py b/Lib/json/tool.py index 1adea31..9ab6d65 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__': |