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

Fixed cPickle, by restoring some of the deleted code.

Browse source 
-This line, and those below, will be ignored--

M    setup.py
M    Modules/cPickle.c
This commit is contained in:
Guido van Rossum 2006-08-17 22:28:49 +00:00
parent 49d6b07c6b
commit 512ab9f8d3
2 changed files with 41 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Modules/cPickle.c
View file

@ -1786,7 +1786,6 @@ save_dict(Picklerobject *self, PyObject *args)
} }
static int static int
save_global(Picklerobject *self, PyObject *args, PyObject *name) save_global(Picklerobject *self, PyObject *args, PyObject *name)
{ {
@ -2278,6 +2277,12 @@ save(Picklerobject *self, PyObject *args, int pers_save)
} }
break; break;
case 'i':
break;
case 'c':
break;
case 'f': case 'f':
if (type == &PyFunction_Type) { if (type == &PyFunction_Type) {
res = save_global(self, args, NULL); res = save_global(self, args, NULL);
@ -3438,6 +3443,30 @@ load_dict(Unpicklerobject *self)
return 0; return 0;
} }
static PyObject *
Instance_New(PyObject *cls, PyObject *args)
{
PyObject *r = 0;
if ((r=PyObject_CallObject(cls, args))) return r;
{
PyObject *tp, *v, *tb, *tmp_value;
PyErr_Fetch(&tp, &v, &tb);
tmp_value = v;
/* NULL occurs when there was a KeyboardInterrupt */
if (tmp_value == NULL)
tmp_value = Py_None;
if ((r = PyTuple_Pack(3, tmp_value, cls, args))) {
Py_XDECREF(v);
v=r;
}
PyErr_Restore(tp,v,tb);
}
return NULL;
}
static int static int
load_obj(Unpicklerobject *self) load_obj(Unpicklerobject *self)
@ -3448,6 +3477,10 @@ load_obj(Unpicklerobject *self)
if ((i = marker(self)) < 0) return -1; if ((i = marker(self)) < 0) return -1;
if (!( tup=Pdata_popTuple(self->stack, i+1))) return -1; if (!( tup=Pdata_popTuple(self->stack, i+1))) return -1;
PDATA_POP(self->stack, class); PDATA_POP(self->stack, class);
if (class) {
obj = Instance_New(class, tup);
Py_DECREF(class);
}
Py_DECREF(tup); Py_DECREF(tup);
if (! obj) return -1; if (! obj) return -1;
@ -3483,8 +3516,8 @@ load_inst(Unpicklerobject *self)
if (! class) return -1; if (! class) return -1;
if ((tup=Pdata_popTuple(self->stack, i))) { if ((tup=Pdata_popTuple(self->stack, i))) {
PyErr_SetString(UnpicklingError, "it's dead, Jim"); obj = Instance_New(class, tup);
return -1; Py_DECREF(tup);
} }
Py_DECREF(class); Py_DECREF(class);
@ -4177,6 +4210,10 @@ load_reduce(Unpicklerobject *self)
PDATA_POP(self->stack, arg_tup); PDATA_POP(self->stack, arg_tup);
if (! arg_tup) return -1; if (! arg_tup) return -1;
PDATA_POP(self->stack, callable); PDATA_POP(self->stack, callable);
if (callable) {
ob = Instance_New(callable, arg_tup);
Py_DECREF(callable);
}
Py_DECREF(arg_tup); Py_DECREF(arg_tup);
if (! ob) return -1; if (! ob) return -1;

2
setup.py
View file

@ -430,7 +430,7 @@ class PyBuildExt(build_ext):
# cStringIO and cPickle # cStringIO and cPickle
exts.append( Extension('cStringIO', ['cStringIO.c']) ) exts.append( Extension('cStringIO', ['cStringIO.c']) )
##exts.append( Extension('cPickle', ['cPickle.c']) ) exts.append( Extension('cPickle', ['cPickle.c']) )
# Memory-mapped files (also works on Win32). # Memory-mapped files (also works on Win32).
if platform not in ['atheos', 'mac']: if platform not in ['atheos', 'mac']: