From 5e8ffe147710e449c2e935a4e2ff5cbd19828a8a Mon Sep 17 00:00:00 2001 From: Hai Shi Date: Mon, 4 May 2020 21:31:38 +0800 Subject: [PATCH] bpo-39573: Use Py_IS_TYPE to check for types (GH-19882) --- Objects/genericaliasobject.c | 4 ++-- Objects/typeobject.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c index c06d79c5561..4d511a23906 100644 --- a/Objects/genericaliasobject.c +++ b/Objects/genericaliasobject.c @@ -424,8 +424,8 @@ ga_getattro(PyObject *self, PyObject *name) static PyObject * ga_richcompare(PyObject *a, PyObject *b, int op) { - if (Py_TYPE(a) != &Py_GenericAliasType || - Py_TYPE(b) != &Py_GenericAliasType || + if (!Py_IS_TYPE(a, &Py_GenericAliasType) || + !Py_IS_TYPE(b, &Py_GenericAliasType) || (op != Py_EQ && op != Py_NE)) { Py_RETURN_NOTIMPLEMENTED; diff --git a/Objects/typeobject.c b/Objects/typeobject.c index c2ddc162ac8..db0ae970090 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -6306,7 +6306,7 @@ FUNCNAME(PyObject *self, PyObject *other) \ stack[1] = other; \ r = vectorcall_maybe(tstate, &op_id, stack, 2); \ if (r != Py_NotImplemented || \ - Py_TYPE(other) == Py_TYPE(self)) \ + Py_IS_TYPE(other, Py_TYPE(self))) \ return r; \ Py_DECREF(r); \ } \