Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

SF 1062353: set pickling problems 

Support automatic pickling of dictionaries in instance of set subclasses.
This commit is contained in:
Raymond Hettinger 2004-11-09 07:25:31 +00:00
parent f8c075cefc
commit 15056a5202
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/test/test_set.py
View File

@ -175,9 +175,15 @@ class TestJointOps(unittest.TestCase):
self.failIf(set('cbs').issuperset('a'))
def test_pickling(self):
p = pickle.dumps(self.s)
dup = pickle.loads(p)
self.assertEqual(self.s, dup, "%s != %s" % (self.s, dup))
for i in (0, 1, 2):
p = pickle.dumps(self.s, i)
dup = pickle.loads(p)
self.assertEqual(self.s, dup, "%s != %s" % (self.s, dup))
if type(self.s) not in (set, frozenset):
self.s.x = 10
p = pickle.dumps(self.s)
dup = pickle.loads(p)
self.assertEqual(self.s.x, dup.x)
def test_deepcopy(self):
class Tracer:

11
Objects/setobject.c
View File

@ -844,7 +844,7 @@ PyDoc_STRVAR(pop_doc, "Remove and return an arbitrary set element.");
static PyObject *
set_reduce(PySetObject *so)
{
PyObject *keys=NULL, *args=NULL, *result=NULL;
PyObject *keys=NULL, *args=NULL, *result=NULL, *dict=NULL;
keys = PyDict_Keys(so->data);
if (keys == NULL)
@ -852,10 +852,17 @@ set_reduce(PySetObject *so)
args = PyTuple_Pack(1, keys);
if (args == NULL)
goto done;
result = PyTuple_Pack(2, so->ob_type, args);
dict = PyObject_GetAttrString((PyObject *)so, "__dict__");
if (dict == NULL) {
PyErr_Clear();
dict = Py_None;
Py_INCREF(dict);
}
result = PyTuple_Pack(3, so->ob_type, args, dict);
done:
Py_XDECREF(args);
Py_XDECREF(keys);
Py_XDECREF(dict);
return result;
}