From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 31 Oct 2012 18:10:04 +0000 (-0400)
Subject: merge 3.3 (#16345)
X-Git-Tag: v3.4.0a1~2126
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7503e085882501c7a887d67b65f19b5ee9bfa361;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#16345)
---

7503e085882501c7a887d67b65f19b5ee9bfa361
diff --cc Misc/NEWS
index 399bc3fae1d1,c760a34ae456..909bdffcac20
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -18,9 -15,9 +18,12 @@@ Core and Builtin
  - Fix segfaults on setting __qualname__ on builtin types and attempting to
    delete it on any type.
  
 +- Issue #14625: Rewrite the UTF-32 decoder. It is now 3x to 4x faster. Patch
 +  written by Serhiy Storchaka.
 +
+ - Issue #16345: Fix an infinite loop when ``fromkeys`` on a dict subclass
+   recieved a nonempty dict from the constructor.
+ 
  - Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a
    class's __dict__ and on type.