[Python-checkins] CVS: python/dist/src/Objects object.c,2.147,2.148

[Tim Peters]

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

Modified Files:
	object.c 
Log Message:
merge_class_dict():  Clear the error if __bases__ doesn't exist.


Index: object.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/object.c,v
retrieving revision 2.147
retrieving revision 2.148
diff -C2 -d -r2.147 -r2.148
*** object.c	2001/09/14 15:50:08	2.147
--- object.c	2001/09/16 20:33:22	2.148
***************
*** 1400,1404 ****
  	/* Recursively merge in the base types' (if any) dicts. */
  	bases = PyObject_GetAttrString(aclass, "__bases__");
! 	if (bases != NULL) {
  		int i, n;
  		assert(PyTuple_Check(bases));
--- 1400,1406 ----
  	/* Recursively merge in the base types' (if any) dicts. */
  	bases = PyObject_GetAttrString(aclass, "__bases__");
! 	if (bases == NULL)
! 		PyErr_Clear();
! 	else {
  		int i, n;
  		assert(PyTuple_Check(bases));