Merge from 3.2

78a0f208 · Andrew Svetlov · a5e82204 · f3c29767 · 78a0f208 · 78a0f208
Commit 78a0f208 authored Mar 31, 2012 by Andrew Svetlov
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

Lib/idlelib/NEWS.txt Lib/idlelib/NEWS.txt +4 -2

Misc/NEWS Misc/NEWS +4 -2

No files found.
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,8 +3,10 @@ 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 #14409: IDLE now properly executes commands in the Shell window
+  when it cannot read the normal config files on startup and
+  has to use the built-in default key bindings.
+  There was previously a bug in one of the defaults.

 - Issue #3573: IDLE hangs when passing invalid command line args
  (directory(ies) instead of file(s)).

--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,8 +34,10 @@ 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 #14409: IDLE now properly executes commands in the Shell window
+  when it cannot read the normal config files on startup and
+  has to use the built-in default key bindings.
+  There was previously a bug in one of the defaults.

 - Issue #14416: syslog now defines the LOG_ODELAY and LOG_AUTHPRIV constants
  if they are defined in <syslog.h>.