From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 16 Mar 2012 14:35:38 +0000 (-0500)
Subject: merge 3.2 (#14334)
X-Git-Tag: v3.3.0a2~152
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de394543b4d31c0226fd8700475adccf6a3eb934;p=thirdparty%2FPython%2Fcpython.git

merge 3.2 (#14334)
---

de394543b4d31c0226fd8700475adccf6a3eb934
diff --cc Misc/NEWS
index 7843459c3498,6659aadcfccc..470ab420173c
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,8 -10,9 +10,11 @@@ What's New in Python 3.3.0 Alpha 2
  Core and Builtins
  -----------------
  
 +- Give the ast.AST class a __dict__.
 +
+ - Issue #14334: Prevent in a segfault in type.__getattribute__ when it was not
+   passed strings.
+ 
  - Issue #1469629: Allow cycles through an object's __dict__ slot to be
    collected. (For example if ``x.__dict__ is x``).