[Python-checkins] python/dist/src/Objects typeobject.c,2.215,2.216

[rhettinger@users.sourceforge.net]

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

Modified Files:
	typeobject.c 
Log Message:
SF bug #699934: Obscure error message

Clarify error message for mro conflicts.


Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.215
retrieving revision 2.216
diff -C2 -d -r2.215 -r2.216
*** typeobject.c	7 Mar 2003 15:13:17 -0000	2.215
--- typeobject.c	12 Mar 2003 04:25:42 -0000	2.216
***************
*** 1077,1081 ****
  	n = PyDict_Size(set);
  
! 	off = PyOS_snprintf(buf, sizeof(buf), "MRO conflict among bases");
  	i = 0;
  	while (PyDict_Next(set, &i, &k, &v) && off < sizeof(buf)) {
--- 1077,1084 ----
  	n = PyDict_Size(set);
  
! 	off = PyOS_snprintf(buf, sizeof(buf), "Cannot create class.\
! The superclasses have conflicting\n\
! inheritance trees which leave the method resolution order (MRO)\n\
! undefined for bases");
  	i = 0;
  	while (PyDict_Next(set, &i, &k, &v) && off < sizeof(buf)) {