summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-05-03 02:37:13 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-05-03 02:37:13 (GMT)
commit88abdef02b33774e7d675a7cc47a9b2567a41921 (patch)
tree39002cc8696adb52a8e454c470f528b8d34901f4 /Misc
parentc9083bf1a14d9949c07804123712d2a18566fe62 (diff)
parent122f4b1bda8262ace6aa021935e8c605a17c3748 (diff)
downloadcpython-88abdef02b33774e7d675a7cc47a9b2567a41921.zip
cpython-88abdef02b33774e7d675a7cc47a9b2567a41921.tar.gz
cpython-88abdef02b33774e7d675a7cc47a9b2567a41921.tar.bz2
merge 3.4 (#24094)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index e2b61c3..6a3c30b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,6 +25,9 @@ Core and Builtins
Library
-------
+- Issue #24094: Fix possible crash in json.encode with poorly behaved dict
+ subclasses.
+
- Issue #9246: On POSIX, os.getcwd() now supports paths longer than 1025 bytes.
Patch written by William Orr.