From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 7 Oct 2015 02:42:46 +0000 (-0700)
Subject: merge 3.5 (closes #24806)
X-Git-Tag: v3.6.0a1~1313
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdae2cb88abdc6e92ef0364cf3cc6d85bff8f72c;p=python

merge 3.5 (closes #24806)
---

cdae2cb88abdc6e92ef0364cf3cc6d85bff8f72c
diff --cc Misc/NEWS
index 074577f803,de56df22e9..4209f079c4
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,15 -11,11 +10,18 @@@ Release date: XXXX-XX-X
  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``.
 +
  - Issue #24848: Fixed a number of bugs in UTF-7 decoding of misformed data.
  
 +- Issue #25267: The UTF-8 encoder is now up to 75 times as fast for error
 +  handlers: ``ignore``, ``replace``, ``surrogateescape``, ``surrogatepass``.
 +  Patch co-written with Serhiy Storchaka.
 +
  - Issue #25280: Import trace messages emitted in verbose (-v) mode are no
    longer formatted twice.