diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2018-07-31 06:09:36 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-31 06:09:36 (GMT) |
| commit | 48c8bf21f97aeb124dbd48bf2bdec1ab4ebc5202 (patch) | |
| tree | 6678ae7f56e368ef192b8e0f5988f7c317dbb246 /Python | |
| parent | dc9039da239ee572eaaf56e4a026be1fc4d74e24 (diff) | |
| download | cpython-48c8bf21f97aeb124dbd48bf2bdec1ab4ebc5202.zip cpython-48c8bf21f97aeb124dbd48bf2bdec1ab4ebc5202.tar.gz cpython-48c8bf21f97aeb124dbd48bf2bdec1ab4ebc5202.tar.bz2 | |
[2.7] bpo-34234: Use _PyAnyInt_Check() and _PyAnyInt_CheckExact(). (GH-8479)
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/Python-ast.c | 2 | ||||
| -rw-r--r-- | Python/bltinmodule.c | 4 | ||||
| -rw-r--r-- | Python/ceval.c | 3 | ||||
| -rw-r--r-- | Python/pythonrun.c | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/Python/Python-ast.c b/Python/Python-ast.c index 4ac5cf5..2e7a1af 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -617,7 +617,7 @@ static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena) static int obj2ast_int(PyObject* obj, int* out, PyArena* arena) { int i; - if (!PyInt_Check(obj) && !PyLong_Check(obj)) { + if (!_PyAnyInt_Check(obj)) { PyObject *s = PyObject_Repr(obj); if (s == NULL) return 1; PyErr_Format(PyExc_ValueError, "invalid integer value: %.400s", diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 9ce3b27..f19115d 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -1780,7 +1780,7 @@ get_range_long_argument(PyObject *arg, const char *name) { PyObject *v; PyNumberMethods *nb; - if (PyInt_Check(arg) || PyLong_Check(arg)) { + if (_PyAnyInt_Check(arg)) { Py_INCREF(arg); return arg; } @@ -1795,7 +1795,7 @@ get_range_long_argument(PyObject *arg, const char *name) v = nb->nb_int(arg); if (v == NULL) return NULL; - if (PyInt_Check(v) || PyLong_Check(v)) + if (_PyAnyInt_Check(v)) return v; Py_DECREF(v); PyErr_SetString(PyExc_TypeError, diff --git a/Python/ceval.c b/Python/ceval.c index b55b4d6..2088a27 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -4750,8 +4750,7 @@ _PyEval_SliceIndexNotNone(PyObject *v, Py_ssize_t *pi) #undef ISINDEX -#define ISINDEX(x) ((x) == NULL || \ - PyInt_Check(x) || PyLong_Check(x) || PyIndex_Check(x)) +#define ISINDEX(x) ((x) == NULL || _PyAnyInt_Check(x) || PyIndex_Check(x)) static PyObject * apply_slice(PyObject *u, PyObject *v, PyObject *w) /* return u[v:w] */ diff --git a/Python/pythonrun.c b/Python/pythonrun.c index c33b6c0..5707c9f 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -1136,7 +1136,7 @@ handle_system_exit(void) /* If we failed to dig out the 'code' attribute, just let the else clause below print the error. */ } - if (PyInt_Check(value) || PyLong_Check(value)) + if (_PyAnyInt_Check(value)) exitcode = (int)PyInt_AsLong(value); else { PyObject *sys_stderr = PySys_GetObject("stderr"); |