summaryrefslogtreecommitdiff
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-05-02 22:36:26 -0400
committerBenjamin Peterson <benjamin@python.org>2015-05-02 22:36:26 -0400
commit122f4b1bda8262ace6aa021935e8c605a17c3748 (patch)
treefbe4e3303a9900d7c469786d12a8786d2f224c96 /Misc
parent0a9933ebf3704540a5f31225b26acb990e1de4bf (diff)
parent501182a47b722a02edd83a344ba53d06cd9afbd1 (diff)
downloadcpython-git-122f4b1bda8262ace6aa021935e8c605a17c3748.tar.gz
merge 3.3 (#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 24fc1507e0..b0a87a797e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -39,6 +39,9 @@ Core and Builtins
Library
-------
+- Issue #24094: Fix possible crash in json.encode with poorly behaved dict
+ subclasses.
+
- Asyncio issue 222 / PR 231 (Victor Stinner) -- fix @coroutine
functions without __name__.