summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-10-07 02:42:46 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-10-07 02:42:46 (GMT)
commitcdae2cb88abdc6e92ef0364cf3cc6d85bff8f72c (patch)
treedcd65f45534243495f0961a8ac3694b19e00f076 /Misc
parent4d17a6aceed79577bc4d35c733fc0ce3181bbd03 (diff)
parent59dc696821da8888b5ac1b86c6c0fd4202f92b39 (diff)
downloadcpython-cdae2cb88abdc6e92ef0364cf3cc6d85bff8f72c.zip
cpython-cdae2cb88abdc6e92ef0364cf3cc6d85bff8f72c.tar.gz
cpython-cdae2cb88abdc6e92ef0364cf3cc6d85bff8f72c.tar.bz2
merge 3.5 (closes #24806)
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 074577f..4209f07 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ Release date: XXXX-XX-XX
Core and Builtins
-----------------
+- Issue #24806: Prevent builtin types that are not allowed to be subclassed from
+ being subclassed through multiple inheritance.
+
* Issue #25301: The UTF-8 decoder is now up to 15 times as fast for error
handlers: ``ignore``, ``replace`` and ``surrogateescape``.