summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-11-29 00:18:34 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-11-29 00:18:34 (GMT)
commit401cf295e59a9a60ba26a9d5964f31c2c3016285 (patch)
tree1998fea1e2ef9c412ebe604befaf4cd2e2affdc0 /Misc
parentd7fed3705909734de38e54a8ac9683a6d96b7e4a (diff)
parent1e86d01e1ebca5554c51d18dee404658c14bce00 (diff)
downloadcpython-401cf295e59a9a60ba26a9d5964f31c2c3016285.zip
cpython-401cf295e59a9a60ba26a9d5964f31c2c3016285.tar.gz
cpython-401cf295e59a9a60ba26a9d5964f31c2c3016285.tar.bz2
#16549: merge with 3.3.
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 0b29321..25ed40c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -892,6 +892,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 e75fd3c..92c3ff7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -140,6 +140,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.