From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 26 Nov 2011 00:13:12 +0000 (+0100)
Subject: Merge heads
X-Git-Tag: v3.3.0a1~732
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c366117820eb34e14f4bf2b1f82a47b7a9cbc04a;p=python

Merge heads
---

c366117820eb34e14f4bf2b1f82a47b7a9cbc04a
diff --cc Misc/NEWS
index da04ba5658,1b8d0cb719..c60cea0bbd
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,10 -10,12 +10,16 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
 +- Issue #11849: Ensure that free()d memory arenas are really released
 +  on POSIX systems supporting anonymous memory mappings.  Patch by
 +  Charles-François Natali.
 +
+ - Issue #13452: PyUnicode_EncodeDecimal() doesn't support error handlers
+   different than "strict" anymore. The caller was unable to compute the
+   size of the output buffer: it depends on the error handler.
+ 
+ - PEP 3155 / issue #13448: Qualified name for classes and functions.
+ 
  - Issue #13436: Fix a bogus error message when an AST object was passed
    an invalid integer value.