From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Sat, 31 Mar 2012 11:20:19 +0000 (+0300)
Subject: Merge from 3.2
X-Git-Tag: v3.3.0a2~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78a0f208cc3e09a084df236b2d1bc8131ae06c17;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.2
---

78a0f208cc3e09a084df236b2d1bc8131ae06c17
diff --cc Lib/idlelib/NEWS.txt
index 8c5cce063b96,a6b06b40e0a7..d50abd44d29b
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -1,10 -1,10 +1,12 @@@
 -What's New in IDLE 3.2.3?
 +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)).
diff --cc Misc/NEWS
index 596cacc10112,d084fac9b80d..2deb75133e0f
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -34,22 -31,11 +34,24 @@@ Core and Builtin
  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>.
 +
 +- IDLE can be launched as python -m idlelib
 +
 +- Issue #14295: Add unittest.mock
 +
 +- Issue #7652: Add --with-system-libmpdec option to configure for linking
 +  the _decimal module against an installed libmpdec.
 +
 +- Issue #14380: MIMEText now defaults to utf-8 when passed non-ASCII unicode
 +  with no charset specified.
 +
  - 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.