SF #1693079 Array module cannot pickle empty arrays

This commit is contained in:
Raymond Hettinger 2007-04-02 17:03:46 +00:00
parent 93e9384402
commit 4bbcb64d5d
3 changed files with 30 additions and 6 deletions

View File

@ -111,6 +111,21 @@ class BaseTest(unittest.TestCase):
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])

View File

@ -134,6 +134,8 @@ Core and builtins
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

View File

@ -1147,12 +1147,19 @@ array_reduce(arrayobject *array)
dict = Py_None;
Py_INCREF(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;
}