Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 15:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

SF patch #1062279: deque pickling problems

Browse source 
(Contributed by Dima Dorfman.)

* Support pickling of dictionaries in instances of deque subclasses.
* Support pickling of recursive deques.
This commit is contained in:
Raymond Hettinger 2004-11-09 07:27:35 +00:00
parent 15056a5202
commit 952f8808b2
2 changed files with 48 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Lib/test/test_deque.py
View file

@ -297,10 +297,19 @@ def test_roundtrip_iter_init(self):
def test_pickle(self):
d = deque(xrange(200))
s = pickle.dumps(d)
e = pickle.loads(s)
self.assertNotEqual(id(d), id(e))
self.assertEqual(list(d), list(e))
for i in (0, 1, 2):
s = pickle.dumps(d, i)
e = pickle.loads(s)
self.assertNotEqual(id(d), id(e))
self.assertEqual(list(d), list(e))
def test_pickle_recursive(self):
d = deque('abc')
d.append(d)
for i in (0, 1, 2):
e = pickle.loads(pickle.dumps(d, i))
self.assertNotEqual(id(d), id(e))
self.assertEqual(id(e), id(e[-1]))
def test_deepcopy(self):
mut = [10]
@ -430,6 +439,10 @@ def test_iter_with_altered_data(self):
class Deque(deque):
pass
class DequeWithBadIter(deque):
def __iter__(self):
raise TypeError
class TestSubclass(unittest.TestCase):
def test_basics(self):
@ -472,6 +485,25 @@ def test_copy_pickle(self):
self.assertEqual(type(d), type(e))
self.assertEqual(list(d), list(e))
def test_pickle(self):
d = Deque('abc')
d.append(d)
e = pickle.loads(pickle.dumps(d))
self.assertNotEqual(id(d), id(e))
self.assertEqual(type(d), type(e))
dd = d.pop()
ee = e.pop()
self.assertEqual(id(e), id(ee))
self.assertEqual(d, e)
d.x = d
e = pickle.loads(pickle.dumps(d))
self.assertEqual(id(e), id(e.x))
d = DequeWithBadIter('abc')
self.assertRaises(TypeError, pickle.dumps, d)
def test_weakref(self):
d = deque('gallahad')
p = proxy(d)

22
Modules/collectionsmodule.c
View file

@ -550,19 +550,21 @@ PyDoc_STRVAR(copy_doc, "Return a shallow copy of a deque.");
static PyObject *
deque_reduce(dequeobject *deque)
{
PyObject *seq, *args, *result;
PyObject *dict, *result, *it;
seq = PySequence_Tuple((PyObject *)deque);
if (seq == NULL)
return NULL;
args = PyTuple_Pack(1, seq);
if (args == NULL) {
Py_DECREF(seq);
dict = PyObject_GetAttrString((PyObject *)deque, "__dict__");
if (dict == NULL) {
PyErr_Clear();
dict = Py_None;
Py_INCREF(dict);
}
it = PyObject_GetIter((PyObject *)deque);
if (it == NULL) {
Py_DECREF(dict);
return NULL;
}
result = PyTuple_Pack(2, deque->ob_type, args);
Py_DECREF(seq);
Py_DECREF(args);
result = Py_BuildValue("O()ON", deque->ob_type, dict, it);
Py_DECREF(dict);
return result;
}