summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-03-29 16:01:28 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-03-29 16:01:28 (GMT)
commit67ac0792037349b01ab2193ea9a057ffc420239e (patch)
tree7c13e7544f1dbd9c379fb89f0aff780be6064497 /Lib/idlelib
parent07cf1d8085e40840459df877ddaded7c539a6806 (diff)
downloadcpython-67ac0792037349b01ab2193ea9a057ffc420239e.zip
cpython-67ac0792037349b01ab2193ea9a057ffc420239e.tar.gz
cpython-67ac0792037349b01ab2193ea9a057ffc420239e.tar.bz2
Issue #14409: IDLE doesn't not execute commands from shell with default keybinding for <Return>.
Patch by Roger Serwy.
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/NEWS.txt3
-rw-r--r--Lib/idlelib/configHandler.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 4482be2..f7fbe45 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,6 +1,9 @@
What's New in IDLE 3.2.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 73b8db5..da92726 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>'],