diff options
| author | Neil Schemenauer <nascheme@enme.ucalgary.ca> | 2005-08-31 23:02:05 +0000 |
|---|---|---|
| committer | Neil Schemenauer <nascheme@enme.ucalgary.ca> | 2005-08-31 23:02:05 +0000 |
| commit | fff86d2c664fb75a3b114fd900a3216998442516 (patch) | |
| tree | 50380135b05460adb6f57fc96620879264b8da85 /Objects/stringobject.c | |
| parent | d7062cee07a34ed69f3d388109e48147c4d65021 (diff) | |
| download | cpython-fff86d2c664fb75a3b114fd900a3216998442516.tar.gz | |
Fix bug in last checkin (2.231). To match previous behavior, unicode
subclasses should be substituted as-is and not have tp_str called on
them.
Diffstat (limited to 'Objects/stringobject.c')
| -rw-r--r-- | Objects/stringobject.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 9bcae0ff2c..05deb3a98c 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -4078,6 +4078,11 @@ PyString_Format(PyObject *format, PyObject *args) break; case 's': #ifdef Py_USING_UNICODE + if (PyUnicode_Check(v)) { + fmt = fmt_start; + argidx = argidx_start; + goto unicode; + } temp = _PyObject_Str(v); if (temp != NULL && PyUnicode_Check(temp)) { Py_DECREF(temp); |