[Python-checkins] cpython (merge 3.2 -> 3.3): #16549: merge with 3.2.
ezio.melotti
python-checkins at python.org
Thu Nov 29 01:27:50 CET 2012
http://hg.python.org/cpython/rev/1e2ae5e01963
changeset: 80637:1e2ae5e01963
branch: 3.3
parent: 80629:9d6706b6b482
parent: 80636:44c544809e6c
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Thu Nov 29 02:16:58 2012 +0200
summary:
#16549: merge with 3.2.
files:
Lib/json/tool.py | 20 +++--
Lib/test/json_tests/test_tool.py | 69 ++++++++++++++++++++
Misc/ACKS | 1 +
Misc/NEWS | 3 +
4 files changed, 84 insertions(+), 9 deletions(-)
diff --git a/Lib/json/tool.py b/Lib/json/tool.py
--- a/Lib/json/tool.py
+++ b/Lib/json/tool.py
@@ -18,19 +18,21 @@
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__':
diff --git a/Lib/test/json_tests/test_tool.py b/Lib/test/json_tests/test_tool.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/json_tests/test_tool.py
@@ -0,0 +1,69 @@
+import os
+import sys
+import textwrap
+import unittest
+import subprocess
+from test import support
+from test.script_helper import assert_python_ok
+
+class TestTool(unittest.TestCase):
+ data = """
+
+ [["blorpie"],[ "whoops" ] , [
+ ],\t"d-shtaeou",\r"d-nthiouh",
+ "i-vhbjkhnth", {"nifty":87}, {"morefield" :\tfalse,"field"
+ :"yes"} ]
+ """
+
+ expect = textwrap.dedent("""\
+ [
+ [
+ "blorpie"
+ ],
+ [
+ "whoops"
+ ],
+ [],
+ "d-shtaeou",
+ "d-nthiouh",
+ "i-vhbjkhnth",
+ {
+ "nifty": 87
+ },
+ {
+ "field": "yes",
+ "morefield": false
+ }
+ ]
+ """)
+
+ def test_stdin_stdout(self):
+ with subprocess.Popen(
+ (sys.executable, '-m', 'json.tool'),
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE) as proc:
+ out, err = proc.communicate(self.data.encode())
+ self.assertEqual(out, self.expect.encode())
+ self.assertEqual(err, None)
+
+ def _create_infile(self):
+ infile = support.TESTFN
+ with open(infile, "w") as fp:
+ self.addCleanup(os.remove, infile)
+ fp.write(self.data)
+ return infile
+
+ def test_infile_stdout(self):
+ infile = self._create_infile()
+ rc, out, err = assert_python_ok('-m', 'json.tool', infile)
+ self.assertEqual(out, self.expect.encode())
+ self.assertEqual(err, b'')
+
+ def test_infile_outfile(self):
+ infile = self._create_infile()
+ outfile = support.TESTFN + '.out'
+ rc, out, err = assert_python_ok('-m', 'json.tool', infile, outfile)
+ self.addCleanup(os.remove, outfile)
+ with open(outfile, "r") as fp:
+ self.assertEqual(fp.read(), self.expect)
+ self.assertEqual(out, b'')
+ self.assertEqual(err, b'')
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -889,6 +889,7 @@
William Park
Harri Pasanen
Gaël Pasgrimaud
+Berker Peksag
Bo Peng
Joe Peterson
Randy Pausch
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -96,6 +96,9 @@
Library
-------
+- Issue #16549: Make json.tool work again on Python 3 and add tests.
+ Initial patch by Berker Peksag and Serhiy Storchaka.
+
- Issue #12848: The pure Python pickle implementation now treats object
lengths as unsigned 32-bit integers, like the C implementation does.
Patch by Serhiy Storchaka.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list