From 0c7c48e02c8ea242a7e85f4668f2542de4dd3281 Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Mon, 3 Feb 2003 22:07:24 +0000 Subject: [PATCH] load_counted_long(): Changed a ValueError to an UnpicklingError, just because it seems more consistent with the rest of the code. cPickle_PyMapping_HasKey(): This extern function isn't used anywhere in Python or Zope, so got rid of it. --- Modules/cPickle.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/Modules/cPickle.c b/Modules/cPickle.c index 49e7271830..10f65d674d 100644 --- a/Modules/cPickle.c +++ b/Modules/cPickle.c @@ -360,20 +360,6 @@ static PyTypeObject Unpicklertype; static int save(Picklerobject *, PyObject *, int); static int put2(Picklerobject *, PyObject *); -int -cPickle_PyMapping_HasKey(PyObject *o, PyObject *key) -{ - PyObject *v; - - if ((v = PyObject_GetItem(o,key))) { - Py_DECREF(v); - return 1; - } - - PyErr_Clear(); - return 0; -} - static PyObject * cPickle_ErrFormat(PyObject *ErrType, char *stringformat, char *format, ...) @@ -3022,7 +3008,7 @@ load_counted_long(Unpicklerobject *self, int size) /* Corrupt or hostile pickle -- we never write one like * this. */ - PyErr_SetString(PyExc_ValueError, "LONG pickle has negative " + PyErr_SetString(UnpicklingError, "LONG pickle has negative " "byte count"); return -1; } -- 2.40.0