From d45014b236f5a8707c104bb5b47bbb006e3bd4f3 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 1 Oct 2005 17:06:00 +0000
Subject: [PATCH] Fix PyString_Format so that the "%s" format works again when
 Unicode is not enabled.

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

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 05deb3a98c7..5797eb91efc 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -4083,7 +4083,9 @@ PyString_Format(PyObject *format, PyObject *args)
 					argidx = argidx_start;
 					goto unicode;
 				}
+#endif
 				temp = _PyObject_Str(v);
+#ifdef Py_USING_UNICODE
 				if (temp != NULL && PyUnicode_Check(temp)) {
 					Py_DECREF(temp);
 					fmt = fmt_start;