diff options
| author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-03-29 16:50:46 (GMT) |
|---|---|---|
| committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-03-29 16:50:46 (GMT) |
| commit | d3cebd790de921f8797744822cdaab5e3f02db9f (patch) | |
| tree | 9ff87f2a77c55e550a91d33eaf9bc9a35abffcb3 /Lib/idlelib | |
| parent | 86407432d5a386bce927377114c4edc3ce254b52 (diff) | |
| parent | 67ac0792037349b01ab2193ea9a057ffc420239e (diff) | |
| download | cpython-d3cebd790de921f8797744822cdaab5e3f02db9f.zip cpython-d3cebd790de921f8797744822cdaab5e3f02db9f.tar.gz cpython-d3cebd790de921f8797744822cdaab5e3f02db9f.tar.bz2 | |
Merge with 3.2
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/NEWS.txt | 3 | ||||
| -rw-r--r-- | Lib/idlelib/configHandler.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 0187af5..8c5cce0 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -3,6 +3,9 @@ What's New in IDLE 3.3? - 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 index 79315ef..4049004 100644 --- a/Lib/idlelib/configHandler.py +++ b/Lib/idlelib/configHandler.py @@ -596,7 +596,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>'], |