summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-03-29 16:54:58 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-03-29 16:54:58 (GMT)
commitc37db10e03d863ee143d22244c0a405c8a004280 (patch)
treee4765381647ddfc82d9bfb6407f6c47db69c2c81
parentde294ec02e7017c462eab5244748b83d63f79ae4 (diff)
downloadcpython-c37db10e03d863ee143d22244c0a405c8a004280.zip
cpython-c37db10e03d863ee143d22244c0a405c8a004280.tar.gz
cpython-c37db10e03d863ee143d22244c0a405c8a004280.tar.bz2
Backport of Issue #14409 to 2.7
IDLE doesn't not execute commands from shell with default keybinding for <Return>. Patch by Roger Serwy.
-rw-r--r--Lib/idlelib/NEWS.txt3
-rw-r--r--Lib/idlelib/configHandler.py2
-rw-r--r--Misc/NEWS3
3 files changed, 7 insertions, 1 deletions
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 205b9f3..ae230e8 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 73487d5..dd13a0e 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 f819029..08215ac 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.