From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Thu, 29 Mar 2012 16:50:46 +0000 (+0300)
Subject: Merge with 3.2
X-Git-Tag: v3.3.0a2~30^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3cebd790de921f8797744822cdaab5e3f02db9f;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2
---

d3cebd790de921f8797744822cdaab5e3f02db9f
diff --cc Lib/idlelib/NEWS.txt
index 0187af53b131,f7fbe457428d..8c5cce063b96
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -1,8 -1,9 +1,11 @@@
 -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 #3573: IDLE hangs when passing invalid command line args
    (directory(ies) instead of file(s)).
  
diff --cc Misc/NEWS
index fce13970b25a,f4a2d03d29c8..596cacc10112
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -34,19 -31,9 +34,22 @@@ 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 #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.