summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-10-07 02:42:02 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-10-07 02:42:02 (GMT)
commit59dc696821da8888b5ac1b86c6c0fd4202f92b39 (patch)
tree99f4e3de908252de56f29239b99b9de954cc40fc /Misc
parent479ac6654c94ee16fe2bfa2acec8d3fe86ef1381 (diff)
parentbd6c41a185ad4a2db9ad693a79496429e2f8d7ee (diff)
downloadcpython-59dc696821da8888b5ac1b86c6c0fd4202f92b39.zip
cpython-59dc696821da8888b5ac1b86c6c0fd4202f92b39.tar.gz
cpython-59dc696821da8888b5ac1b86c6c0fd4202f92b39.tar.bz2
merge 3.4 (#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 66bf5b9..de56df2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -11,6 +11,9 @@ Release date: TBA
Core and Builtins
-----------------
+- Issue #24806: Prevent builtin types that are not allowed to be subclassed from
+ being subclassed through multiple inheritance.
+
- Issue #24848: Fixed a number of bugs in UTF-7 decoding of misformed data.
- Issue #25280: Import trace messages emitted in verbose (-v) mode are no