SF #1693079 Array module cannot pickle empty arrays
This commit is contained in:
parent
93e9384402
commit
4bbcb64d5d
|
@ -111,6 +111,21 @@ class BaseTest(unittest.TestCase):
|
||||||
self.assertEqual(a.x, b.x)
|
self.assertEqual(a.x, b.x)
|
||||||
self.assertEqual(type(a), type(b))
|
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):
|
def test_insert(self):
|
||||||
a = array.array(self.typecode, self.example)
|
a = array.array(self.typecode, self.example)
|
||||||
a.insert(0, self.example[0])
|
a.insert(0, self.example[0])
|
||||||
|
|
|
@ -134,6 +134,8 @@ Core and builtins
|
||||||
Extension Modules
|
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 #1688393: Prevent crash in socket.recvfrom if length is negative.
|
||||||
|
|
||||||
- Bug #1622896: fix a rare corner case where the bz2 module raised an
|
- Bug #1622896: fix a rare corner case where the bz2 module raised an
|
||||||
|
|
|
@ -1147,12 +1147,19 @@ array_reduce(arrayobject *array)
|
||||||
dict = Py_None;
|
dict = Py_None;
|
||||||
Py_INCREF(dict);
|
Py_INCREF(dict);
|
||||||
}
|
}
|
||||||
result = Py_BuildValue("O(cs#)O",
|
if (array->ob_size > 0) {
|
||||||
array->ob_type,
|
result = Py_BuildValue("O(cs#)O",
|
||||||
array->ob_descr->typecode,
|
array->ob_type,
|
||||||
array->ob_item,
|
array->ob_descr->typecode,
|
||||||
array->ob_size * array->ob_descr->itemsize,
|
array->ob_item,
|
||||||
dict);
|
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);
|
Py_DECREF(dict);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue