From ab6192363775022dffc7384bf04c03a8130d47ed Mon Sep 17 00:00:00 2001
From: Neil Schemenauer <nascheme@enme.ucalgary.ca>
Date: Wed, 31 Aug 2005 23:02:05 +0000
Subject: [PATCH] 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.

---
 Objects/stringobject.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 9bcae0ff2c7..05deb3a98c7 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);