diff options
| -rw-r--r-- | Modules/_randommodule.c | 4 | ||||
| -rw-r--r-- | Modules/_sre.c | 2 | ||||
| -rw-r--r-- | Modules/datetimemodule.c | 10 | ||||
| -rw-r--r-- | Objects/abstract.c | 7 | ||||
| -rw-r--r-- | Objects/floatobject.c | 2 | ||||
| -rw-r--r-- | Objects/sliceobject.c | 2 | ||||
| -rw-r--r-- | PC/_winreg.c | 2 |
7 files changed, 14 insertions, 15 deletions
diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c index 95b7ade..bd4d17e 100644 --- a/Modules/_randommodule.c +++ b/Modules/_randommodule.c @@ -231,7 +231,7 @@ random_seed(RandomObject *self, PyObject *args) /* If the arg is an int or long, use its absolute value; else use * the absolute value of its hash code. */ - if (PyInt_Check(arg) || PyLong_Check(arg)) + if (PyLong_Check(arg)) n = PyNumber_Absolute(arg); else { long hash = PyObject_Hash(arg); @@ -401,7 +401,7 @@ random_jumpahead(RandomObject *self, PyObject *n) PyObject *remobj; unsigned long *mt, tmp; - if (!PyInt_Check(n) && !PyLong_Check(n)) { + if (!PyLong_Check(n)) { PyErr_Format(PyExc_TypeError, "jumpahead requires an " "integer, not '%s'", Py_Type(n)->tp_name); diff --git a/Modules/_sre.c b/Modules/_sre.c index 20f98ca..03067cb 100644 --- a/Modules/_sre.c +++ b/Modules/_sre.c @@ -2764,7 +2764,7 @@ match_getindex(MatchObject* self, PyObject* index) if (self->pattern->groupindex) { index = PyObject_GetItem(self->pattern->groupindex, index); if (index) { - if (PyInt_Check(index) || PyLong_Check(index)) + if (PyLong_Check(index)) i = PyInt_AsSsize_t(index); Py_DECREF(index); } else diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c index 046354c..14990a3 100644 --- a/Modules/datetimemodule.c +++ b/Modules/datetimemodule.c @@ -1758,11 +1758,11 @@ delta_multiply(PyObject *left, PyObject *right) if (PyDelta_Check(left)) { /* delta * ??? */ - if (PyInt_Check(right) || PyLong_Check(right)) + if (PyLong_Check(right)) result = multiply_int_timedelta(right, (PyDateTime_Delta *) left); } - else if (PyInt_Check(left) || PyLong_Check(left)) + else if (PyLong_Check(left)) result = multiply_int_timedelta(left, (PyDateTime_Delta *) right); @@ -1778,7 +1778,7 @@ delta_divide(PyObject *left, PyObject *right) if (PyDelta_Check(left)) { /* delta * ??? */ - if (PyInt_Check(right) || PyLong_Check(right)) + if (PyLong_Check(right)) result = divide_timedelta_int( (PyDateTime_Delta *)left, right); @@ -1807,7 +1807,7 @@ accum(const char* tag, PyObject *sofar, PyObject *num, PyObject *factor, assert(num != NULL); - if (PyInt_Check(num) || PyLong_Check(num)) { + if (PyLong_Check(num)) { prod = PyNumber_Multiply(num, factor); if (prod == NULL) return NULL; @@ -1855,7 +1855,7 @@ accum(const char* tag, PyObject *sofar, PyObject *num, PyObject *factor, * fractional part requires float arithmetic, and may * lose a little info. */ - assert(PyInt_Check(factor) || PyLong_Check(factor)); + assert(PyLong_Check(factor)); dnum = PyLong_AsDouble(factor); dnum *= fracpart; 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) { diff --git a/PC/_winreg.c b/PC/_winreg.c index 7386ea1..ddb6b2c 100644 --- a/PC/_winreg.c +++ b/PC/_winreg.c @@ -575,7 +575,7 @@ PyHKEY_AsHKEY(PyObject *ob, HKEY *pHANDLE, BOOL bNoneOK) PyHKEYObject *pH = (PyHKEYObject *)ob; *pHANDLE = pH->hkey; } - else if (PyInt_Check(ob) || PyLong_Check(ob)) { + else if (PyLong_Check(ob)) { /* We also support integers */ PyErr_Clear(); *pHANDLE = (HKEY)PyLong_AsVoidPtr(ob); |