merge 3.2 (#14334)

diff --cc Lib/test/test_descr.py
Simple merge

diff --cc Misc/NEWS
index 7843459c34983ce8f20324ae2a62a304cab48812,6659aadcfcccc40449cffba90741aad8ed794e2c..470ab420173c905d7be545ccafc5f4263ae8cafc
--- 1/Misc/NEWS
--- 2/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``).
  

diff --cc Objects/typeobject.c
Simple merge