From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 31 Oct 2012 18:16:17 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.1rc1~711
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67f7a5ad797e261f23cbdd43e13c57b0f5bec12b;p=python

merge 3.2
---

67f7a5ad797e261f23cbdd43e13c57b0f5bec12b
diff --cc Misc/NEWS
index c760a34ae4,9a18c13f6a..845375d482
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -12,20 -10,14 +12,20 @@@ What's New in Python 3.3.1
  Core and Builtins
  -----------------
  
 +- Fix segfaults on setting __qualname__ on builtin types and attempting to
 +  delete it on any type.
 +
  - 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 #16197: Update winreg docstrings and documentation to match code.
 +- Issue #16271: Fix strange bugs that resulted from __qualname__ appearing in a
 +  class's __dict__ and on type.
 +
 +- Issue #16197: Update winreg docstrings and documentation to match code.      
    Patch by Zachary Ware.
  
 -- Issue #14700: Fix buggy overflow checks when handling large precisions and
 -  widths in old-style and new-style formatting.
 +- Issue #16241: Document -X faulthandler command line option.
 +  Patch by Marek Å uppa.
  
  - Issue #6074: Ensure cached bytecode files can always be updated by the
    user that created them, even when the source file is read-only.