From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 22 Mar 2012 12:19:50 +0000 (-0400)
Subject: merge 3.2 (#14378)
X-Git-Tag: v3.3.0a2~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98ba7534322696250267438053fb36cea5b0a85f;p=python

merge 3.2 (#14378)
---

98ba7534322696250267438053fb36cea5b0a85f
diff --cc Misc/NEWS
index 70d908e63c,1c1bf16466..85ac5c0354
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,10 -10,11 +10,14 @@@ What's New in Python 3.3.0 Alpha 2
  Core and Builtins
  -----------------
  
 +- 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 #14378: Fix compiling ast.ImportFrom nodes with a "__future__" string as
+   the module name that was not interned.
+ 
+ - Issue #14331: Use significantly less stack space when importing modules by
+   allocating path buffers on the heap instead of the stack.
  
  - Issue #14334: Prevent in a segfault in type.__getattribute__ when it was not
    passed strings.