[Python-checkins] CVS: python/dist/src/Python getargs.c,2.69,2.70
Tim Peters
tim_one@users.sourceforge.net
2001年10月26日 17:17:38 -0700
Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv22471/python/Python
Modified Files:
getargs.c
Log Message:
vgetargskeywords(): remove test that can't succeed. Not a bugfix, just
removing useless obfuscation.
Index: getargs.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/getargs.c,v
retrieving revision 2.69
retrieving revision 2.70
diff -C2 -d -r2.69 -r2.70
*** getargs.c 2001年10月23日 21:09:29 2.69
--- getargs.c 2001年10月27日 00:17:34 2.70
***************
*** 1029,1035 ****
int nkwds, pos, match, converted;
PyObject *key, *value;
!
/* nested tuples cannot be parsed when using keyword arguments */
!
for (;;) {
int c = *format++;
--- 1029,1035 ----
int nkwds, pos, match, converted;
PyObject *key, *value;
!
/* nested tuples cannot be parsed when using keyword arguments */
!
for (;;) {
int c = *format++;
***************
*** 1069,1088 ****
/* do a cursory check of the keywords just to see how many we got */
!
if (keywords) {
if (!PyDict_Check(keywords)) {
! if (keywords == NULL)
! PyErr_SetString(PyExc_SystemError,
! "NULL received when keyword dictionary expected");
! else
! PyErr_Format(PyExc_SystemError,
! "%s received when keyword dictionary expected",
! keywords->ob_type->tp_name);
return 0;
}
kwlen = PyDict_Size(keywords);
- }
- else {
- kwlen = 0;
}
--- 1069,1082 ----
/* do a cursory check of the keywords just to see how many we got */
!
! kwlen = 0;
if (keywords) {
if (!PyDict_Check(keywords)) {
! PyErr_Format(PyExc_SystemError,
! "%s received when keyword dictionary expected",
! keywords->ob_type->tp_name);
return 0;
}
kwlen = PyDict_Size(keywords);
}