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

merge 3.3
---

3cb90241fc9d95612879bd8f479c7a059108ef0a
diff --cc Misc/NEWS
index 332299a336a1,347885fed141..7c6a319fe40c
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,15 -12,13 +10,21 @@@ What's New in Python 3.4.0 Alpha 1
  Core and Builtins
  -----------------
  
 +- Issue #16086: PyTypeObject.tp_flags and PyType_Spec.flags are now unsigned
 +  (unsigned long and unsigned int) to avoid an undefined behaviour with
 +  Py_TPFLAGS_TYPE_SUBCLASS ((1 << 31). PyType_GetFlags() result type is
 +  now unsigned too (unsigned long, instead of long).
 +
+ - 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 #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.      
 +- Issue #16197: Update winreg docstrings and documentation to match code.
    Patch by Zachary Ware.
  
  - Issue #16241: Document -X faulthandler command line option.