[Python-checkins] CVS: python/dist/src/Objects classobject.c,2.133,2.134

[Tim Peters]

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv13818/python/dist/src/Objects

Modified Files:
	classobject.c 
Log Message:
Fix the test_weakref.py failure.  Introduced by resolving "a conflict"
(which didn't actually exist!) incorrectly.


Index: classobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/classobject.c,v
retrieving revision 2.133
retrieving revision 2.134
diff -C2 -d -r2.133 -r2.134
*** classobject.c	2001/08/02 04:15:00	2.133
--- classobject.c	2001/08/02 04:45:20	2.134
***************
*** 194,204 ****
  		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)
--- 194,197 ----