commit eb65e2443ac21739baf6d373abc7b4638b9d6927
author Jeroen Demeyer <J.Demeyer@UGent.be> Tue May 28 14:42:53 2019 +0200
committer Petr Viktorin <encukou@gmail.com> Tue May 28 14:42:53 2019 +0200
tree 2197fa4322a60cbe077dfb8c03e0287cd3baabd9
parent 0811f2d81a12a3415dc2cb2744b41520c48d4db5

bpo-36922: implement PEP-590 Py_TPFLAGS_METHOD_DESCRIPTOR (GH-13338)

Co-authored-by: Mark Shannon <mark@hotpy.org>

Objects/object.c

diff --git a/Objects/object.c b/Objects/object.c
index 270716f..87dba98 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1155,8 +1155,7 @@
     descr = _PyType_Lookup(tp, name);
     if (descr != NULL) {
         Py_INCREF(descr);
-        if (PyFunction_Check(descr) ||
-                (Py_TYPE(descr) == &PyMethodDescr_Type)) {
+        if (PyType_HasFeature(Py_TYPE(descr), Py_TPFLAGS_METHOD_DESCRIPTOR)) {
             meth_found = 1;
         } else {
             f = descr->ob_type->tp_descr_get;