mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 06:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

SF #1693079: Cannot save empty array in shelve

Browse source
This commit is contained in:
Raymond Hettinger 2007-04-02 17:29:30 +00:00
parent 5447850f6f
commit e6e660bde3
2 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/test/test_array.py
View file

@ -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])

19
Modules/arraymodule.c
View file

@ -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;
} }