[Python-checkins] cpython (merge 2.7 -> 2.7): merge 2.7.2 release branch

[benjamin.peterson]

http://hg.python.org/cpython/rev/b18c83b48b7d
changeset:   70624:b18c83b48b7d
branch:      2.7
parent:      70619:39c29bc8bc35
parent:      70623:42fd2d1fc58d
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Jun 03 16:17:48 2011 -0500
summary:
  merge 2.7.2 release branch

files:
  Misc/NEWS |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -60,8 +60,9 @@
   "maximum recursion depth" RuntimeError exception.
   (patch by Ronald Oussoren)
 
-- Correct lookup of __dir__ on objects. Among other things, this causes errors
-  besides AttributeError found on lookup to be propagated.
+- Correct lookup of __dir__ on objects. This allows old-style classes to have
+  __dir__. It also causes errors besides AttributeError found on lookup to be
+  propagated.
 
 - Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c,
   clear the end-of-file indicator after CTRL+d.

-- 
Repository URL: http://hg.python.org/cpython