[Python-checkins] python/dist/src/Objects typeobject.c,2.228,2.229

[gvanrossum@users.sourceforge.net]

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

Modified Files:
	typeobject.c 
Log Message:
Improve the message about metatype/metaclass conflicts.


Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.228
retrieving revision 2.229
diff -C2 -d -r2.228 -r2.229
*** typeobject.c	16 Apr 2003 20:01:36 -0000	2.228
--- typeobject.c	23 Apr 2003 12:07:22 -0000	2.229
***************
*** 1581,1585 ****
  		}
  		PyErr_SetString(PyExc_TypeError,
! 				"metatype conflict among bases");
  		return NULL;
  	}
--- 1581,1588 ----
  		}
  		PyErr_SetString(PyExc_TypeError,
! 				"metaclass conflict: "
! 				"the metaclass of a derived class "
! 				"must be a (non-strict) subclass "
! 				"of the metaclasses of all its bases");
  		return NULL;
  	}