summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2012-01-13 21:53:25 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2012-01-13 21:53:25 (GMT)
commitdee76e627d1561d519b0eb0b179e226f0e1a343f (patch)
treeb3a4528be82a2413d3399ac9ea279124db0ed7d1 /Misc
parent44765e58b08b5591d30f194871cb672909159e4d (diff)
downloadcpython-dee76e627d1561d519b0eb0b179e226f0e1a343f.zip
cpython-dee76e627d1561d519b0eb0b179e226f0e1a343f.tar.gz
cpython-dee76e627d1561d519b0eb0b179e226f0e1a343f.tar.bz2
Issue #13774: json: Fix a SystemError when a bogus encoding is passed to
json.loads().
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 aa32dd7..ae2c1a3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -374,6 +374,9 @@ Library
Extension Modules
-----------------
+- Issue #13774: json: Fix a SystemError when a bogus encoding is passed to
+ json.loads().
+
- Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by
Vilmos Nebehaj.