Sigh. The crucial change was still missing from the previous

checkin. :-(

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index d45ee89adb0925450488ee97c369a2e62b30ff2c..1bfda3212720992a2fe5db183bc15591cc0bb374 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -5399,7 +5399,7 @@ super_getattro(PyObject *self, PyObject *name)
                        else
                                continue;
                        res = PyDict_GetItem(dict, name);
-                       if (res != NULL && !PyDescr_IsData(res)) {
+                       if (res != NULL) {
                                Py_INCREF(res);
                                f = res->ob_type->tp_descr_get;
                                if (f != NULL) {