Fix the test_weakref.py failure. Introduced by resolving "a conflict"

(which didn't actually exist!) incorrectly.

diff --git a/Objects/classobject.c b/Objects/classobject.c
index c4b1d8e1f9b9f04875bd5c4736f0622380d631cd..4bad2fdb45c527e7d0bb3d23b67634a7b9f9c0fc 100644 (file)
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -193,13 +193,6 @@ class_getattr(register PyClassObject *op, PyObject *name)
                             PyString_AS_STRING(op->cl_name), sname);
                return NULL;
        }
-       Py_INCREF(v);
-       if (PyFunction_Check(v)) {
-               PyObject *w = PyMethod_New(v, (PyObject *)NULL,
-                                                   (PyObject *)class);
-               Py_DECREF(v);
-               v = w;
-       }
        f = v->ob_type->tp_descr_get;
        if (f == NULL)
                Py_INCREF(v);