From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Wed, 21 Mar 2012 11:31:12 +0000 (+0200)
Subject: Merge from 3.2 for issue #3573, fix Misc/NEWS as Ned Deily guess.
X-Git-Tag: v3.3.0a2~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=206d2a43a32953145b9d28f7eb8b34aaba1037e4;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.2 for issue #3573, fix Misc/NEWS as Ned Deily guess.
---

206d2a43a32953145b9d28f7eb8b34aaba1037e4
diff --cc Misc/NEWS
index fe37f1038d77,dcf4e2359d85..9a6cc44047a6
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,15 -10,8 +10,10 @@@ 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 #14331: Use significantly less stack space when importing modules by
 -  allocating path buffers on the heap instead of the stack.
 +- Issue #1683368: object.__new__ and object.__init__ raise a TypeError if they
 +  are passed arguments and their complementary method is not overridden.
 +
 +- Give the ast.AST class a __dict__.
  
  - Issue #14334: Prevent in a segfault in type.__getattribute__ when it was not
    passed strings.
@@@ -35,9 -28,9 +30,12 @@@
  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.
 +
  - Issue #13694: asynchronous connect in asyncore.dispatcher does not set addr
    attribute.