From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Tue, 30 Aug 2011 20:07:20 +0000 (+0200)
Subject: Merge from 3.2:
X-Git-Tag: v3.3.0a1~1598
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd2f8b0b776bdc0ad062f183403aa1b5a2629d39;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.2:
- Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to file.write()
- Issue #11241: subclasses of ctypes.Array can now be subclassed.
---

dd2f8b0b776bdc0ad062f183403aa1b5a2629d39
diff --cc Misc/NEWS
index fc9d65c57af9,a562d29af3ab..08a2078b360a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1229,12 -861,6 +1229,17 @@@ Tools/Demo
  Extension Modules
  -----------------
  
++- Issue #11241: subclasses of ctypes.Array can now be subclassed.
++
++- Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to
++  some functions like file.write().
++
 +- Issue #10309: Define _GNU_SOURCE so that mremap() gets the proper
 +  signature.  Without this, architectures where sizeof void* != sizeof int are
 +  broken.  Patch given by Hallvard B Furuseth.
 +
 +- Issue #12221: Replace pyexpat.__version__ with the Python version.
 +
  - Issue #12051: Fix segfault in json.dumps() while encoding highly-nested
    objects using the C accelerations.