From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 23 May 2011 21:27:36 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2183^2~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5cc10b00094f06af56dedd02d39bc46886e17c70;p=python

merge 3.2
---

5cc10b00094f06af56dedd02d39bc46886e17c70
diff --cc Misc/NEWS
index 01b95e2310,fac8078edb..22c3cf4fa6
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,6 -10,28 +10,9 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
 -Library
 --------
 -
+ - Correct lookup of __dir__ on objects. Among other things, this causes errors
+   besides AttributeError found on lookup to be propagated.
+ 
 -- Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymore
 -  to be able to unload the module.
 -
 -- Issue #12065: connect_ex() on an SSL socket now returns the original errno
 -  when the socket's timeout expires (it used to return None).
 -
 -
 -
 -What's New in Python 3.2.1 release candidate 1?
 -===============================================
 -
 -*Release date: 15-May-2011*
 -
 -Core and Builtins
 ------------------
 -
  - Issue #12060: Use sig_atomic_t type and volatile keyword in the signal
    module. Patch written by Charles-François Natali.