[Python-checkins] python/dist/src/Objects stringobject.c,2.162,2.163 unicodeobject.c,2.147,2.148
rhettinger@sourceforge.net
rhettinger@sourceforge.net
2002年5月21日 08:14:59 -0700
Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv23875
Modified Files:
stringobject.c unicodeobject.c
Log Message:
Patch 549187. Improve string formatting error message.
Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.162
retrieving revision 2.163
diff -C2 -d -r2.162 -r2.163
*** stringobject.c 13 May 2002 09:00:41 -0000 2.162
--- stringobject.c 21 May 2002 15:14:57 -0000 2.163
***************
*** 3629,3633 ****
if (dict && (argidx < arglen) && c != '%') {
PyErr_SetString(PyExc_TypeError,
! "not all arguments converted");
goto error;
}
--- 3629,3633 ----
if (dict && (argidx < arglen) && c != '%') {
PyErr_SetString(PyExc_TypeError,
! "not all arguments converted during string formatting");
goto error;
}
***************
*** 3637,3641 ****
if (argidx < arglen && !dict) {
PyErr_SetString(PyExc_TypeError,
! "not all arguments converted");
goto error;
}
--- 3637,3641 ----
if (argidx < arglen && !dict) {
PyErr_SetString(PyExc_TypeError,
! "not all arguments converted during string formatting");
goto error;
}
Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.147
retrieving revision 2.148
diff -C2 -d -r2.147 -r2.148
*** unicodeobject.c 27 Apr 2002 18:44:32 -0000 2.147
--- unicodeobject.c 21 May 2002 15:14:57 -0000 2.148
***************
*** 5709,5713 ****
if (dict && (argidx < arglen) && c != '%') {
PyErr_SetString(PyExc_TypeError,
! "not all arguments converted");
goto onError;
}
--- 5709,5713 ----
if (dict && (argidx < arglen) && c != '%') {
PyErr_SetString(PyExc_TypeError,
! "not all arguments converted during string formatting");
goto onError;
}
***************
*** 5717,5721 ****
if (argidx < arglen && !dict) {
PyErr_SetString(PyExc_TypeError,
! "not all arguments converted");
goto onError;
}
--- 5717,5721 ----
if (argidx < arglen && !dict) {
PyErr_SetString(PyExc_TypeError,
! "not all arguments converted during string formatting");
goto onError;
}