summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-03-21 13:31:12 +0200
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-03-21 13:31:12 +0200
commit206d2a43a32953145b9d28f7eb8b34aaba1037e4 (patch)
tree76df3d9961c3956befdccd1169ae48a6bab7f23f
parent6b6e437626e94ad5ef3233ea9129c48957f1a41b (diff)
parent0f71f4415603d36e0fabec812f93dc80547466b3 (diff)
downloadcpython-git-206d2a43a32953145b9d28f7eb8b34aaba1037e4.tar.gz
Merge from 3.2 for issue #3573, fix Misc/NEWS as Ned Deily guess.
-rw-r--r--Lib/idlelib/NEWS.txt7
-rw-r--r--Misc/NEWS8
2 files changed, 10 insertions, 5 deletions
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 0a4f98e9fb..4482be2024 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,3 +1,10 @@
+What's New in IDLE 3.2.3?
+=========================
+
+- Issue #3573: IDLE hangs when passing invalid command line args
+ (directory(ies) instead of file(s)).
+
+
What's New in IDLE 3.2.1?
=========================
diff --git a/Misc/NEWS b/Misc/NEWS
index fe37f1038d..9a6cc44047 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,11 +10,6 @@ What's New in Python 3.3.0 Alpha 2?
Core and Builtins
-----------------
-- Issue #3573: IDLE hangs when passing invalid command line args
- (directory(ies) instead of file(s))
-
- Thanks to Guilherme Polo for patch and to Roger Serwy for review.
-
- Issue #1683368: object.__new__ and object.__init__ raise a TypeError if they
are passed arguments and their complementary method is not overridden.
@@ -35,6 +30,9 @@ Core and Builtins
Library
-------
+- Issue #3573: IDLE hangs when passing invalid command line args
+ (directory(ies) instead of file(s)) (Patch by Guilherme Polo)
+
- Issue #14269: SMTPD now conforms to the RFC and requires a HELO command
before MAIL, RCPT, or DATA.