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

Minor assorted cleanups; no semantic changes.

This commit is contained in:
Tim Peters 2003-02-13 23:00:26 +00:00
parent 61436489f9
commit 92c8bb3abf
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Modules/cPickle.c
View File

@ -892,7 +892,8 @@ fast_save_enter(Picklerobject *self, PyObject *obj)
if (PyDict_GetItem(self->fast_memo, key)) { if (PyDict_GetItem(self->fast_memo, key)) {
Py_DECREF(key); Py_DECREF(key);
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"fast mode: can't pickle cyclic objects including object type %s at %p", "fast mode: can't pickle cyclic objects "
"including object type %s at %p",
obj->ob_type->tp_name, obj); obj->ob_type->tp_name, obj);
self->fast_container = -1; self->fast_container = -1;
return 0; return 0;
@ -2786,10 +2787,12 @@ get_Pickler(PyObject *self, PyObject *args)
PyObject *file = NULL; PyObject *file = NULL;
int proto = 0; int proto = 0;
/* XXX What is this doing? The documented signature is /* XXX
* XXX Pickler(file, proto=0), but this accepts Pickler() and * The documented signature is Pickler(file, proto=0), but this
* XXX Pickler(integer) too. The meaning then is clear as mud. * accepts Pickler() and Pickler(integer) too. The meaning then
* XXX Bug? Feature? * is clear as mud, undocumented, and not supported by pickle.py.
* I'm told Zope uses this, but I haven't traced into this code
* far enough to figure out what it means.
*/ */
if (!PyArg_ParseTuple(args, "|i:Pickler", &proto)) { if (!PyArg_ParseTuple(args, "|i:Pickler", &proto)) {
PyErr_Clear(); PyErr_Clear();
@ -2949,8 +2952,8 @@ find_class(PyObject *py_module_name, PyObject *py_global_name, PyObject *fc)
if (fc) { if (fc) {
if (fc==Py_None) { if (fc==Py_None) {
PyErr_SetString(UnpicklingError, PyErr_SetString(UnpicklingError, "Global and instance "
"Global and instance pickles are not supported."); "pickles are not supported.");
return NULL; return NULL;
} }
return PyObject_CallFunction(fc, "OO", py_module_name, return PyObject_CallFunction(fc, "OO", py_module_name,
@ -3864,7 +3867,8 @@ load_get(Unpicklerobject *self)
if (! value) { if (! value) {
PyErr_SetObject(BadPickleGet, py_str); PyErr_SetObject(BadPickleGet, py_str);
rc = -1; rc = -1;
} else { }
else {
PDATA_APPEND(self->stack, value, -1); PDATA_APPEND(self->stack, value, -1);
rc = 0; rc = 0;
} }
@ -3891,7 +3895,8 @@ load_binget(Unpicklerobject *self)
if (! value) { if (! value) {
PyErr_SetObject(BadPickleGet, py_key); PyErr_SetObject(BadPickleGet, py_key);
rc = -1; rc = -1;
} else { }
else {
PDATA_APPEND(self->stack, value, -1); PDATA_APPEND(self->stack, value, -1);
rc = 0; rc = 0;
} }
@ -3927,7 +3932,8 @@ load_long_binget(Unpicklerobject *self)
if (! value) { if (! value) {
PyErr_SetObject(BadPickleGet, py_key); PyErr_SetObject(BadPickleGet, py_key);
rc = -1; rc = -1;
} else { }
else {
PDATA_APPEND(self->stack, value, -1); PDATA_APPEND(self->stack, value, -1);
rc = 0; rc = 0;
} }