summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-11-29 00:16:58 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-11-29 00:16:58 (GMT)
commit1e86d01e1ebca5554c51d18dee404658c14bce00 (patch)
treecd7777075e4a381cad3bd79cdeea5a5975b1edb6 /Misc
parent57af3bf1586718b650333a6230e34c279d826f92 (diff)
parent057bcb4c6c7eef93066002db7ab486f12d50ccee (diff)
downloadcpython-1e86d01e1ebca5554c51d18dee404658c14bce00.zip
cpython-1e86d01e1ebca5554c51d18dee404658c14bce00.tar.gz
cpython-1e86d01e1ebca5554c51d18dee404658c14bce00.tar.bz2
#16549: merge with 3.2.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index ced3168..996989d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -889,6 +889,7 @@ Dan Parisien
William Park
Harri Pasanen
Gaƫl Pasgrimaud
+Berker Peksag
Bo Peng
Joe Peterson
Randy Pausch
diff --git a/Misc/NEWS b/Misc/NEWS
index fd44ee6..20b0e8d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -96,6 +96,9 @@ Core and Builtins
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.