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.
This commit is contained in:
parent
a1be88e24d
commit
ab61923637
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue