From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 31 Oct 2012 18:16:22 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~2125
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b80c675899cdd9ce3c8e8f215b10fd263e42480;p=python

merge 3.3
---

9b80c675899cdd9ce3c8e8f215b10fd263e42480
diff --cc Misc/NEWS
index 909bdffcac,845375d482..1437411c16
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -18,11 -15,8 +18,11 @@@ 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.
+   received a nonempty dict from the constructor.
  
  - Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a
    class's __dict__ and on type.