diff options
| author | Tim Peters <tim.peters@gmail.com> | 2001-08-02 04:45:20 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2001-08-02 04:45:20 (GMT) |
| commit | 5962cbf5baa2fb4bf5817b1e272acc3512e49027 (patch) | |
| tree | 80980794e47308dd3ff40e97b56dd78f530717dd /Objects/classobject.c | |
| parent | 6d6c1a35e08b95a83dbe47dbd9e6474daff00354 (diff) | |
| download | cpython-5962cbf5baa2fb4bf5817b1e272acc3512e49027.zip cpython-5962cbf5baa2fb4bf5817b1e272acc3512e49027.tar.gz cpython-5962cbf5baa2fb4bf5817b1e272acc3512e49027.tar.bz2 | |
Fix the test_weakref.py failure. Introduced by resolving "a conflict"
(which didn't actually exist!) incorrectly.
Diffstat (limited to 'Objects/classobject.c')
| -rw-r--r-- | Objects/classobject.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Objects/classobject.c b/Objects/classobject.c index c4b1d8e..4bad2fd 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); |