[Python-checkins] r54657 - in python/branches/release25-maint: Lib/test/test_array.py Misc/NEWS Modules/arraymodule.c
raymond.hettinger
python-checkins at python.org
Mon Apr 2 19:03:53 CEST 2007
Author: raymond.hettinger
Date: Mon Apr 2 19:03:46 2007
New Revision: 54657
Modified:
python/branches/release25-maint/Lib/test/test_array.py
python/branches/release25-maint/Misc/NEWS
python/branches/release25-maint/Modules/arraymodule.c
Log:
SF #1693079 Array module cannot pickle empty arrays
Modified: python/branches/release25-maint/Lib/test/test_array.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_array.py (original)
+++ python/branches/release25-maint/Lib/test/test_array.py Mon Apr 2 19:03:46 2007
@@ -111,6 +111,21 @@
self.assertEqual(a.x, b.x)
self.assertEqual(type(a), type(b))
+ def test_pickle_for_empty_array(self):
+ for protocol in (0, 1, 2):
+ a = array.array(self.typecode)
+ b = loads(dumps(a, protocol))
+ self.assertNotEqual(id(a), id(b))
+ self.assertEqual(a, b)
+
+ a = ArraySubclass(self.typecode)
+ a.x = 10
+ b = loads(dumps(a, protocol))
+ self.assertNotEqual(id(a), id(b))
+ self.assertEqual(a, b)
+ self.assertEqual(a.x, b.x)
+ self.assertEqual(type(a), type(b))
+
def test_insert(self):
a = array.array(self.typecode, self.example)
a.insert(0, self.example[0])
Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS (original)
+++ python/branches/release25-maint/Misc/NEWS Mon Apr 2 19:03:46 2007
@@ -134,6 +134,8 @@
Extension Modules
-----------------
+- Bug #1693079: The array module can now successfully pickle empty arrays.
+
- Bug #1688393: Prevent crash in socket.recvfrom if length is negative.
- Bug #1622896: fix a rare corner case where the bz2 module raised an
Modified: python/branches/release25-maint/Modules/arraymodule.c
==============================================================================
--- python/branches/release25-maint/Modules/arraymodule.c (original)
+++ python/branches/release25-maint/Modules/arraymodule.c Mon Apr 2 19:03:46 2007
@@ -1147,12 +1147,19 @@
dict = Py_None;
Py_INCREF(dict);
}
- result = Py_BuildValue("O(cs#)O",
- array->ob_type,
- array->ob_descr->typecode,
- array->ob_item,
- array->ob_size * array->ob_descr->itemsize,
- dict);
+ if (array->ob_size > 0) {
+ result = Py_BuildValue("O(cs#)O",
+ array->ob_type,
+ array->ob_descr->typecode,
+ array->ob_item,
+ array->ob_size * array->ob_descr->itemsize,
+ dict);
+ } else {
+ result = Py_BuildValue("O(c)O",
+ array->ob_type,
+ array->ob_descr->typecode,
+ dict);
+ }
Py_DECREF(dict);
return result;
}
More information about the Python-checkins
mailing list