A fix & test for
[ 496873 ] structseqs unpicklable
by adding a __reduce__ method to structseqs.
Will also commit this to the 2.2.1 branch momentarily.
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index 1b58edb..e2d2580 100644
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -248,6 +248,13 @@
b = self.loads(s)
self.assertEqual(a.__class__, b.__class__)
+ def test_structseq(self):
+ import time
+ t = time.localtime()
+ s = self.dumps(t)
+ u = self.loads(s)
+ self.assertEqual(t, u)
+
class AbstractPickleModuleTests(unittest.TestCase):
def test_dump_closed_file(self):
diff --git a/Objects/structseq.c b/Objects/structseq.c
index 2ab9b52..e5f8e09 100644
--- a/Objects/structseq.c
+++ b/Objects/structseq.c
@@ -188,6 +188,27 @@
return result;
}
+static PyObject *
+structseq_reduce(PyStructSequence* self)
+{
+ PyObject* tup;
+ long n_fields;
+ int i;
+
+ n_fields = REAL_SIZE(self);
+ tup = PyTuple_New(n_fields);
+ if (!tup) {
+ return NULL;
+ }
+
+ for (i = 0; i < n_fields; i++) {
+ Py_INCREF(self->ob_item[i]);
+ PyTuple_SET_ITEM(tup, i, self->ob_item[i]);
+ }
+
+ return Py_BuildValue("(O(O))", self->ob_type, tup);
+}
+
static PySequenceMethods structseq_as_sequence = {
(inquiry)structseq_length,
(binaryfunc)structseq_concat, /* sq_concat */
@@ -199,6 +220,12 @@
(objobjproc)structseq_contains, /* sq_contains */
};
+static PyMethodDef structseq_methods[] = {
+ {"__reduce__", (PyCFunction)structseq_reduce,
+ METH_NOARGS, NULL},
+ {NULL, NULL}
+};
+
static PyTypeObject _struct_sequence_template = {
PyObject_HEAD_INIT(&PyType_Type)
0, /* ob_size */
@@ -228,7 +255,7 @@
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
- 0, /* tp_methods */
+ structseq_methods, /* tp_methods */
NULL, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
@@ -282,4 +309,6 @@
PyInt_FromLong((long) desc->n_in_sequence));
PyDict_SetItemString(dict, real_length_key,
PyInt_FromLong((long) n_members));
+ PyDict_SetItemString(dict, "__safe_for_unpickling__",
+ PyInt_FromLong(1));
}