mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 13:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

PyObject_Compare can raise an exception now.

Browse source
This commit is contained in:
Guido van Rossum 1997-05-23 00:06:51 +00:00
parent 5b2121b25f
commit c8b6df9004
7 changed files with 67 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Objects/listobject.c
View file

@ -580,8 +580,12 @@ docompare(x, y, compare)
PyObject *args, *res;
int i;
if (compare == NULL)
return PyObject_Compare(x, y);
if (compare == NULL) {
i = PyObject_Compare(x, y);
if (i && PyErr_Occurred())
i = CMPERROR;
return i;
}
args = Py_BuildValue("(OO)", x, y);
if (args == NULL)
@ -955,6 +959,8 @@ listindex(self, args)
for (i = 0; i < self->ob_size; i++) {
if (PyObject_Compare(self->ob_item[i], args) == 0)
return PyInt_FromLong((long)i);
if (PyErr_Occurred())
return NULL;
}
PyErr_SetString(PyExc_ValueError, "list.index(x): x not in list");
return NULL;
@ -975,6 +981,8 @@ listcount(self, args)
for (i = 0; i < self->ob_size; i++) {
if (PyObject_Compare(self->ob_item[i], args) == 0)
count++;
if (PyErr_Occurred())
return NULL;
}
return PyInt_FromLong((long)count);
}
@ -998,7 +1006,8 @@ listremove(self, args)
Py_INCREF(Py_None);
return Py_None;
}
if (PyErr_Occurred())
return NULL;
}
PyErr_SetString(PyExc_ValueError, "list.remove(x): x not in list");
return NULL;