summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-03-12 23:55:07 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-03-12 23:55:07 (GMT)
commit405952f1a89c75d71bf8420b28d4bab1277e2ccd (patch)
tree8dee9f1a2d9a15736a3173319f90dc071ac06b31 /Misc
parent7192eddb4ad7814c98a2e02b943b0ccc9ec4bfd8 (diff)
parent220391fa6e08c79116522a9e00e1089e7ccaf963 (diff)
downloadcpython-405952f1a89c75d71bf8420b28d4bab1277e2ccd.zip
cpython-405952f1a89c75d71bf8420b28d4bab1277e2ccd.tar.gz
cpython-405952f1a89c75d71bf8420b28d4bab1277e2ccd.tar.bz2
#17368: merge with 3.3.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS4
1 files changed, 4 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index b062c6c..a2068b1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -277,6 +277,10 @@ Core and Builtins
Library
-------
+- Issue #17368: Fix an off-by-one error in the Python JSON decoder that caused
+ a failure while decoding empty object literals when object_pairs_hook was
+ specified.
+
_ Issue #17385: Fix quadratic behavior in threading.Condition. The FIFO
queue now uses a deque instead of a list.