[Python-checkins] CVS: python/dist/src/Objects stringobject.c,2.102.2.2,2.102.2.3
Thomas Wouters
twouters@users.sourceforge.net
2001年5月23日 06:14:26 -0700
Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv4349/Objects
Modified Files:
Tag: release21-maint
stringobject.c
Log Message:
Backport MAL's checkin 2.105:
Fix for bug #417030: "print '%*s' fails for unicode string"
Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.102.2.2
retrieving revision 2.102.2.3
diff -C2 -r2.102.2.2 -r2.102.2.3
*** stringobject.c 2001年05月23日 13:03:13 2.102.2.2
--- stringobject.c 2001年05月23日 13:14:24 2.102.2.3
***************
*** 2780,2783 ****
--- 2780,2784 ----
char formatbuf[FORMATBUFLEN]; /* For format{float,int,char}() */
char *fmt_start = fmt;
+ int argidx_start = argidx;
fmt++;
***************
*** 2933,2936 ****
--- 2934,2938 ----
if (PyUnicode_Check(v)) {
fmt = fmt_start;
+ argidx = argidx_start;
goto unicode;
}
***************
*** 3097,3102 ****
args_owned = 0;
}
! /* Fiddle args right (remove the first argidx-1 arguments) */
! --argidx;
if (PyTuple_Check(orig_args) && argidx > 0) {
PyObject *v;
--- 3099,3103 ----
args_owned = 0;
}
! /* Fiddle args right (remove the first argidx arguments) */
if (PyTuple_Check(orig_args) && argidx > 0) {
PyObject *v;