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.

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 9bcae0ff2c7a1c8b5b226930f95237f7bda3abb1..05deb3a98c7760a4be0101bc00de4417a806d06f 100644 (file)
--- 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);