]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge from 3.2:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>
Tue, 30 Aug 2011 20:07:20 +0000 (22:07 +0200)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>
Tue, 30 Aug 2011 20:07:20 +0000 (22:07 +0200)
- 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.

1  2 
Misc/NEWS
Modules/_ctypes/_ctypes.c

diff --cc Misc/NEWS
index fc9d65c57af9f9798daaee444c75689cd9232d99,a562d29af3ab29221a492712eaadc273e773eb5a..08a2078b360a087ad42f5554767677843f4dfae4
+++ 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.
  
Simple merge