diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2007-08-31 04:32:55 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2007-08-31 04:32:55 (GMT) |
| commit | 1fe5f388529dcdf674d53f7d67abc16c9c6ca5e5 (patch) | |
| tree | b35d6a88c4ded09687f9916e4d4c0b03bafde580 /Objects | |
| parent | 538d17aa233e99a0652d0c6d482845e8e909b6e0 (diff) | |
| download | cpython-1fe5f388529dcdf674d53f7d67abc16c9c6ca5e5.zip cpython-1fe5f388529dcdf674d53f7d67abc16c9c6ca5e5.tar.gz cpython-1fe5f388529dcdf674d53f7d67abc16c9c6ca5e5.tar.bz2 | |
Remove checking redundantly for checks of PyInt and PyLong.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/abstract.c | 7 | ||||
| -rw-r--r-- | Objects/floatobject.c | 2 | ||||
| -rw-r--r-- | Objects/sliceobject.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index 8eb0fea..8d213b2 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -1153,14 +1153,13 @@ PyNumber_Index(PyObject *item) PyObject *result = NULL; if (item == NULL) return null_error(); - if (PyInt_Check(item) || PyLong_Check(item)) { + if (PyLong_Check(item)) { Py_INCREF(item); return item; } if (PyIndex_Check(item)) { result = item->ob_type->tp_as_number->nb_index(item); - if (result && - !PyInt_Check(result) && !PyLong_Check(result)) { + if (result && !PyLong_Check(result)) { PyErr_Format(PyExc_TypeError, "__index__ returned non-int " "(type %.200s)", @@ -1270,7 +1269,7 @@ PyNumber_Long(PyObject *o) } if (m && m->nb_long) { /* This should include subclasses of long */ PyObject *res = m->nb_long(o); - if (res && (!PyInt_Check(res) && !PyLong_Check(res))) { + if (res && !PyLong_Check(res)) { PyErr_Format(PyExc_TypeError, "__long__ returned non-long (type %.200s)", res->ob_type->tp_name); diff --git a/Objects/floatobject.c b/Objects/floatobject.c index c060d8b..7c489d9 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -331,7 +331,7 @@ float_richcompare(PyObject *v, PyObject *w, int op) j = PyFloat_AS_DOUBLE(w); else if (!Py_IS_FINITE(i)) { - if (PyInt_Check(w) || PyLong_Check(w)) + if (PyLong_Check(w)) /* If i is an infinity, its magnitude exceeds any * finite integer, so it doesn't matter which int we * compare i with. If i is a NaN, similarly. diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c index eb66c79..d160b07 100644 --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -106,7 +106,7 @@ PySlice_GetIndices(PySliceObject *r, Py_ssize_t length, if (r->step == Py_None) { *step = 1; } else { - if (!PyInt_Check(r->step) && !PyLong_Check(r->step)) return -1; + if (!PyLong_Check(r->step)) return -1; *step = PyInt_AsSsize_t(r->step); } if (r->start == Py_None) { |