[Python-checkins] cpython (merge 3.2 -> default): Merge from 3.2

[andrew.svetlov]

http://hg.python.org/cpython/rev/ec99fd5b5e60
changeset:   76007:ec99fd5b5e60
parent:      76005:5b3a44f22470
parent:      76006:ba32b8c7f5be
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Sat Mar 31 14:20:19 2012 +0300
summary:
  Merge from 3.2

files:
  Lib/idlelib/NEWS.txt |  6 ++++--
  Misc/NEWS            |  6 ++++--
  2 files changed, 8 insertions(+), 4 deletions(-)


diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,8 +3,10 @@
 
 - IDLE can be launched as `python -m idlelib`
 
-- Issue #14409: IDLE doesn't not execute commands from shell,
-  error with default keybinding for Return. (Patch by Roger Serwy)
+- Issue #14409: IDLE now properly executes commands in the Shell window
+  when it cannot read the normal config files on startup and
+  has to use the built-in default key bindings.
+  There was previously a bug in one of the defaults.
 
 - Issue #3573: IDLE hangs when passing invalid command line args
   (directory(ies) instead of file(s)).
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,8 +34,10 @@
 Library
 -------
 
-- Issue #14409: IDLE doesn't not execute commands from shell,
-  error with default keybinding for Return. (Patch by Roger Serwy)
+- Issue #14409: IDLE now properly executes commands in the Shell window
+  when it cannot read the normal config files on startup and
+  has to use the built-in default key bindings.
+  There was previously a bug in one of the defaults.
 
 - Issue #14416: syslog now defines the LOG_ODELAY and LOG_AUTHPRIV constants
   if they are defined in <syslog.h>.

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