From: Tim Peters <tim.peters@gmail.com>
Date: Thu, 2 Aug 2001 04:45:20 +0000 (+0000)
Subject: Fix the test_weakref.py failure.  Introduced by resolving "a conflict"
X-Git-Tag: v2.2a3~874
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5962cbf5baa2fb4bf5817b1e272acc3512e49027;p=python

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 c4b1d8e1f9..4bad2fdb45 100644
--- 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);