Keep the list.pop() optimization while restoring the many possibility

for types other than PyInt being accepted for the optional argument.
(Spotted by Neal Norwitz.)
This commit is contained in:
Raymond Hettinger 2004-02-19 06:12:06 +00:00
parent 44dbae8cca
commit fa6c6f8a73
1 changed files with 2 additions and 4 deletions

View File

@ -779,10 +779,8 @@ listpop(PyListObject *self, PyObject *args)
if (arg != NULL) {
if (PyInt_Check(arg))
i = (int)(PyInt_AS_LONG((PyIntObject*) arg));
else {
PyErr_SetString(PyExc_TypeError, "an integer is required");
return NULL;
}
else if (!PyArg_ParseTuple(args, "|i:pop", &i))
return NULL;
}
if (self->ob_size == 0) {
/* Special-case most common failure cause */