[Python-checkins] python/dist/src/Objects abstract.c,2.126,2.127

Sun Mar 21 11:59:12 EST 2004

Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4599/Objects
Modified Files:
	abstract.c 
Log Message:
recursive_isinstance(), recursive_issubclass(): New code here returned
NULL in case of error, but the functions are declared to return int.
MSVC 6 properly complains about that. Return -1 on error instead.
Index: abstract.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/abstract.c,v
retrieving revision 2.126
retrieving revision 2.127
diff -C2 -d -r2.126 -r2.127
*** abstract.c	20 Mar 2004 22:52:14 -0000	2.126
--- abstract.c	21 Mar 2004 16:59:09 -0000	2.127
***************
*** 2034,2038 ****
 PyErr_SetString(PyExc_RuntimeError,
 "nest level of tuple too deep");
! return NULL;
 }
 
--- 2034,2038 ----
 PyErr_SetString(PyExc_RuntimeError,
 "nest level of tuple too deep");
! return -1;
 }
 
***************
*** 2089,2093 ****
 PyErr_SetString(PyExc_RuntimeError,
 "nest level of tuple too deep");
! return NULL;
 }
 			for (i = 0; i < n; ++i) {
--- 2089,2093 ----
 PyErr_SetString(PyExc_RuntimeError,
 "nest level of tuple too deep");
! return -1;
 }
 			for (i = 0; i < n; ++i) {