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

[andrew.svetlov]

http://hg.python.org/cpython/rev/971a8d291af9
changeset:   75985:971a8d291af9
parent:      75984:9c2b710da3c7
parent:      75983:26b2407c644e
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Thu Mar 29 19:50:46 2012 +0300
summary:
  Merge with 3.2

files:
  Lib/idlelib/NEWS.txt         |  3 +++
  Lib/idlelib/configHandler.py |  2 +-
  Misc/NEWS                    |  3 +++
  3 files changed, 7 insertions(+), 1 deletions(-)


diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,9 @@
 
 - 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 #3573: IDLE hangs when passing invalid command line args
   (directory(ies) instead of file(s)).
 
diff --git a/Lib/idlelib/configHandler.py b/Lib/idlelib/configHandler.py
--- a/Lib/idlelib/configHandler.py
+++ b/Lib/idlelib/configHandler.py
@@ -596,7 +596,7 @@
             '<<replace>>': ['<Control-h>'],
             '<<goto-line>>': ['<Alt-g>'],
             '<<smart-backspace>>': ['<Key-BackSpace>'],
-            '<<newline-and-indent>>': ['<Key-Return> <Key-KP_Enter>'],
+            '<<newline-and-indent>>': ['<Key-Return>', '<Key-KP_Enter>'],
             '<<smart-indent>>': ['<Key-Tab>'],
             '<<indent-region>>': ['<Control-Key-bracketright>'],
             '<<dedent-region>>': ['<Control-Key-bracketleft>'],
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,6 +34,9 @@
 Library
 -------
 
+- Issue #14409: IDLE doesn't not execute commands from shell,
+  error with default keybinding for Return. (Patch by Roger Serwy)
+
 - 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