mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

A fix & test for

Browse source 
[ 496873 ] structseqs unpicklable

by adding a __reduce__ method to structseqs.

Will also commit this to the 2.2.1 branch momentarily.
This commit is contained in:
Michael W. Hudson 2002-03-05 13:27:58 +00:00
parent 58fb237948
commit 7bb466a1a5
2 changed files with 37 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/test/pickletester.py
View file

@ -248,6 +248,13 @@ class AbstractPickleTests(unittest.TestCase):
b = self.loads(s) b = self.loads(s)
self.assertEqual(a.__class__, b.__class__) 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): class AbstractPickleModuleTests(unittest.TestCase):
def test_dump_closed_file(self): def test_dump_closed_file(self):

31
Objects/structseq.c
View file

@ -188,6 +188,27 @@ structseq_richcompare(PyObject *obj, PyObject *o2, int op)
return result; 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 = { static PySequenceMethods structseq_as_sequence = {
(inquiry)structseq_length, (inquiry)structseq_length,
(binaryfunc)structseq_concat, /* sq_concat */ (binaryfunc)structseq_concat, /* sq_concat */
@ -199,6 +220,12 @@ static PySequenceMethods structseq_as_sequence = {
(objobjproc)structseq_contains, /* sq_contains */ (objobjproc)structseq_contains, /* sq_contains */
}; };
static PyMethodDef structseq_methods[] = {
{"__reduce__", (PyCFunction)structseq_reduce,
METH_NOARGS, NULL},
{NULL, NULL}
};
static PyTypeObject _struct_sequence_template = { static PyTypeObject _struct_sequence_template = {
PyObject_HEAD_INIT(&PyType_Type) PyObject_HEAD_INIT(&PyType_Type)
0, /* ob_size */ 0, /* ob_size */
@ -228,7 +255,7 @@ static PyTypeObject _struct_sequence_template = {
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
0, /* tp_iter */ 0, /* tp_iter */
0, /* tp_iternext */ 0, /* tp_iternext */
0, /* tp_methods */ structseq_methods, /* tp_methods */
NULL, /* tp_members */ NULL, /* tp_members */
0, /* tp_getset */ 0, /* tp_getset */
0, /* tp_base */ 0, /* tp_base */
@ -282,4 +309,6 @@ PyStructSequence_InitType(PyTypeObject *type, PyStructSequence_Desc *desc)
PyInt_FromLong((long) desc->n_in_sequence)); PyInt_FromLong((long) desc->n_in_sequence));
PyDict_SetItemString(dict, real_length_key, PyDict_SetItemString(dict, real_length_key,
PyInt_FromLong((long) n_members)); PyInt_FromLong((long) n_members));
PyDict_SetItemString(dict, "__safe_for_unpickling__",
PyInt_FromLong(1));
} }