Mercurial > cpython-lru_cache-weakref
diff Objects/stringobject.c @ 17655:0470babdae49 legacy-trunk
Fix for bug #417030: "print '%*s' fails for unicode string"
| author | Marc-André Lemburg <mal@egenix.com> |
|---|---|
| date | Wed, 02 May 2001 14:21:53 +0000 |
| parents | b5f583eecb20 |
| children | 9e093bf8f6a9 |
line wrap: on
line diff
--- a/Objects/stringobject.c Wed May 02 07:39:38 2001 +0000 +++ b/Objects/stringobject.c Wed May 02 14:21:53 2001 +0000 @@ -2781,6 +2781,7 @@ int len; char formatbuf[FORMATBUFLEN]; /* For format{float,int,char}() */ char *fmt_start = fmt; + int argidx_start = argidx; fmt++; if (*fmt == '(') { @@ -2934,6 +2935,7 @@ case 'r': if (PyUnicode_Check(v)) { fmt = fmt_start; + argidx = argidx_start; goto unicode; } if (c == 's') @@ -3098,8 +3100,7 @@ Py_DECREF(args); args_owned = 0; } - /* Fiddle args right (remove the first argidx-1 arguments) */ - --argidx; + /* Fiddle args right (remove the first argidx arguments) */ if (PyTuple_Check(orig_args) && argidx > 0) { PyObject *v; int n = PyTuple_GET_SIZE(orig_args) - argidx;