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

Allow using long integers as arguments to PyObject_GetItem(), _SetItem(), 

and _DelItem().
In sequence multiplication by a long, only call PyErr_Occurred() when the
    value returned is -1.
This commit is contained in:
Andrew M. Kuchling 2000-02-23 22:21:50 +00:00
parent 2194b165db
commit 0f223d2418
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Objects/abstract.c
View File

@ -122,6 +122,12 @@ PyObject_GetItem(o, key)
if (o->ob_type->tp_as_sequence) {
if (PyInt_Check(key))
return PySequence_GetItem(o, PyInt_AsLong(key));
else if (PyLong_Check(key)) {
long key_value = PyLong_AsLong(key);
if (key_value == -1 && PyErr_Occurred())
return NULL;
return PySequence_GetItem(o, key_value);
}
return type_error("sequence index must be integer");
}
@ -147,6 +153,12 @@ PyObject_SetItem(o, key, value)
if (o->ob_type->tp_as_sequence) {
if (PyInt_Check(key))
return PySequence_SetItem(o, PyInt_AsLong(key), value);
else if (PyLong_Check(key)) {
long key_value = PyLong_AsLong(key);
if (key_value == -1 && PyErr_Occurred())
return -1;
return PySequence_SetItem(o, key_value, value);
}
type_error("sequence index must be integer");
return -1;
}
@ -173,6 +185,12 @@ PyObject_DelItem(o, key)
if (o->ob_type->tp_as_sequence) {
if (PyInt_Check(key))
return PySequence_DelItem(o, PyInt_AsLong(key));
else if (PyLong_Check(key)) {
long key_value = PyLong_AsLong(key);
if (key_value == -1 && PyErr_Occurred())
return -1;
return PySequence_DelItem(o, key_value);
}
type_error("sequence index must be integer");
return -1;
}
@ -391,7 +409,7 @@ PyNumber_Multiply(v, w)
}
else if (PyLong_Check(w)) {
mul_value = PyLong_AsLong(w);
if (PyErr_Occurred())
if (mul_value == -1 && PyErr_Occurred())
return NULL;
}
else {