[Python-checkins] python/dist/src/Objects typeobject.c,2.190,2.191
mwh@users.sourceforge.net
mwh@users.sourceforge.net
Wed, 27 Nov 2002 02:24:46 -0800
Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1:/tmp/cvs-serv17140/Objects
Modified Files:
typeobject.c
Log Message:
I had the inheritance cycle stuff backwards. Oops!
Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.190
retrieving revision 2.191
diff -C2 -d -r2.190 -r2.191
*** typeobject.c 26 Nov 2002 17:49:11 -0000 2.190
--- typeobject.c 27 Nov 2002 10:24:43 -0000 2.191
***************
*** 209,216 ****
return -1;
}
! if (PyType_IsSubtype(type, (PyTypeObject*)ob)) {
! PyErr_SetString(PyExc_TypeError,
! "a __bases__ item causes an inheritance cycle");
! return -1;
}
}
--- 209,218 ----
return -1;
}
! if (PyType_Check(ob)) {
! if (PyType_IsSubtype((PyTypeObject*)ob, type)) {
! PyErr_SetString(PyExc_TypeError,
! "a __bases__ item causes an inheritance cycle");
! return -1;
! }
}
}