[Python-checkins] CVS: python/dist/src/Python getargs.c,2.77,2.78

2001年10月26日 22:30:19 -0700

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv10854/python/Python
Modified Files:
	getargs.c 
Log Message:
vgetargskeywords: Removed one of the mysterious PyErr_Clear() calls.
The "need" for this was probably removed by an earlier patch that stopped
the loop right before it from passing NULL to a dict lookup routine.
I still haven't convinced myself that the next loop is correct, so am
leaving the next mysterious PyErr_Clear() call in for now.
Index: getargs.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/getargs.c,v
retrieving revision 2.77
retrieving revision 2.78
diff -C2 -d -r2.77 -r2.78
*** getargs.c	2001年10月27日 05:07:41	2.77
--- getargs.c	2001年10月27日 05:30:17	2.78
***************
*** 1100,1115 ****
 		}
 	}
! 	/* XXX The loop just above didn't used to break when hitting the
! 	 end of kwlist, so could pass NULL on to PyMapping_HasKeyString,
! 	 which sets a "NULL argument to internal routine" error then.
! 	 However, the comment below doesn't give any clues about which
! 	 'error string' it's talking about, so darned hard to say whether
! 	 the PyErr_Clear() still serves a purpose.
! 	*/
! 	PyErr_Clear(); /* I'm not which Py functions set the error string */
! 		
 	/* required arguments missing from args can be supplied by keyword 
 	 arguments */
- 	
 	len = nargs;
 	if (keywords && nargs < min) {
--- 1100,1106 ----
 		}
 	}
! 
 	/* required arguments missing from args can be supplied by keyword 
 	 arguments */
 	len = nargs;
 	if (keywords && nargs < min) {