From: Petri Lehtinen <petri@digip.org>
Date: Sat, 19 Nov 2011 20:04:33 +0000 (+0200)
Subject: Merge branch 3.2 (closes #13338)
X-Git-Tag: v3.3.0a1~805
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aadc519ceb91124b3078bb409f2282ffc8ef8765;p=python

Merge branch 3.2 (closes #13338)
---

aadc519ceb91124b3078bb409f2282ffc8ef8765
diff --cc Misc/ACKS
index 986debd4b6,c66edb7ab1..acf214746e
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -132,9 -124,9 +132,10 @@@ Titus Brow
  Oleg Broytmann
  Dave Brueck
  Francisco Martín Brugué
+ Floris Bruynooghe
  Stan Bubrouski
  Erik de Bueger
 +Jan-Hein Bührman
  Dick Bulterman
  Bill Bumgarner
  Jimmy Burgett
diff --cc Misc/NEWS
index 183e4ed49a,c3765dd973..90c0f3b556
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,14 -10,10 +10,18 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
+ - Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER
+   to allow compiling extension modules with -Wswitch-enum on gcc.
+   Initial patch by Floris Bruynooghe.
+ 
 +- Issue #10227: Add an allocation cache for a single slice object.  Patch by
 +  Stefan Behnel.
 +
 +- Issue #13393: BufferedReader.read1() now asks the full requested size to
 +  the raw stream instead of limiting itself to the buffer size.
 +
 +- Issue #13392: Writing a pyc file should now be atomic under Windows as well.
 +
  - Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder
    already accepts them).