merge 2.7.2 release branch

This commit is contained in:
Benjamin Peterson 2011-06-03 16:17:48 -05:00
commit d571cf5ab0
1 changed files with 3 additions and 2 deletions

View File

@ -60,8 +60,9 @@ Core and Builtins
"maximum recursion depth" RuntimeError exception. "maximum recursion depth" RuntimeError exception.
(patch by Ronald Oussoren) (patch by Ronald Oussoren)
- Correct lookup of __dir__ on objects. Among other things, this causes errors - Correct lookup of __dir__ on objects. This allows old-style classes to have
besides AttributeError found on lookup to be propagated. __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, - Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c,
clear the end-of-file indicator after CTRL+d. clear the end-of-file indicator after CTRL+d.