Fix PyString_Format so that the "%s" format works again when Unicode is not

enabled.

Fix PyString_Format so that the "%s" format works again when Unicode is not
enabled.
e4f83c1d · Georg Brandl · a3c8fc7f · e4f83c1d
Commit e4f83c1d authored Oct 01, 2005 by Georg Brandl
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

Objects/stringobject.c Objects/stringobject.c +2 -0

No files found.
--- 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;