diff options
| author | Andy Lester <andy@petdance.com> | 2020-03-04 13:15:20 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 13:15:20 (GMT) |
| commit | dffe4c07095e0c693e094d3c140e85a68bd8128e (patch) | |
| tree | 1f58f4c2f76d6f630c5279a7b72d31bb6b4d8873 /Python | |
| parent | 22a9a546ff3bf2a63d77ca1e5494e758bc59132f (diff) | |
| download | cpython-dffe4c07095e0c693e094d3c140e85a68bd8128e.zip cpython-dffe4c07095e0c693e094d3c140e85a68bd8128e.tar.gz cpython-dffe4c07095e0c693e094d3c140e85a68bd8128e.tar.bz2 | |
bpo-39573: Finish converting to new Py_IS_TYPE() macro (GH-18601)
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 4 | ||||
| -rw-r--r-- | Python/errors.c | 2 | ||||
| -rw-r--r-- | Python/importdl.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 3f65820..ef4aac2 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -4851,7 +4851,7 @@ trace_call_function(PyThreadState *tstate, C_TRACE(x, PyObject_Vectorcall(func, args, nargs, kwnames)); return x; } - else if (Py_TYPE(func) == &PyMethodDescr_Type && nargs > 0) { + else if (Py_IS_TYPE(func, &PyMethodDescr_Type) && nargs > 0) { /* We need to create a temporary bound method as argument for profiling. @@ -4912,7 +4912,7 @@ do_call_core(PyThreadState *tstate, PyObject *func, PyObject *callargs, PyObject C_TRACE(result, PyObject_Call(func, callargs, kwdict)); return result; } - else if (Py_TYPE(func) == &PyMethodDescr_Type) { + else if (Py_IS_TYPE(func, &PyMethodDescr_Type)) { Py_ssize_t nargs = PyTuple_GET_SIZE(callargs); if (nargs > 0 && tstate->use_tracing) { /* We need to create a temporary bound method as argument diff --git a/Python/errors.c b/Python/errors.c index 61dc597..6baa229 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -573,7 +573,7 @@ PyErr_BadArgument(void) PyObject * _PyErr_NoMemory(PyThreadState *tstate) { - if (Py_TYPE(PyExc_MemoryError) == NULL) { + if (Py_IS_TYPE(PyExc_MemoryError, NULL)) { /* PyErr_NoMemory() has been called before PyExc_MemoryError has been initialized by _PyExc_Init() */ Py_FatalError("Out of memory and PyExc_MemoryError is not " diff --git a/Python/importdl.c b/Python/importdl.c index 1d0d32a..fbeb9fb 100644 --- a/Python/importdl.c +++ b/Python/importdl.c @@ -181,7 +181,7 @@ _PyImport_LoadDynamicModuleWithSpec(PyObject *spec, FILE *fp) m = NULL; goto error; } - if (Py_TYPE(m) == NULL) { + if (Py_IS_TYPE(m, NULL)) { /* This can happen when a PyModuleDef is returned without calling * PyModuleDef_Init on it */ |