From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Thu, 29 Mar 2012 16:54:58 +0000 (+0300)
Subject: Backport of Issue #14409 to 2.7
X-Git-Tag: v2.7.4rc1~939
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c37db10e03d863ee143d22244c0a405c8a004280;p=thirdparty%2FPython%2Fcpython.git

Backport of Issue #14409 to 2.7

IDLE doesn't not execute commands from shell with default keybinding
for <Return>.
Patch by Roger Serwy.
---

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 205b9f3b48e8..ae230e804738 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,6 +1,9 @@
 What's New in IDLE 2.7.3?
 =======================
 
+- 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
index 73487d56f31a..dd13a0e7334e 100644
--- a/Lib/idlelib/configHandler.py
+++ b/Lib/idlelib/configHandler.py
@@ -595,7 +595,7 @@ class IdleConf:
             '<<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
index f8190298dbe4..08215ac6da37 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -35,6 +35,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #14409: IDLE doesn't not execute commands from shell,
+  error with default keybinding for Return. (Patch by Roger Serwy)
+
 - Issue #10340: asyncore - properly handle EINVAL in dispatcher constructor on
   OSX; avoid to call handle_connect in case of a disconnected socket which
   was not meant to connect.