commit | d45014b236f5a8707c104bb5b47bbb006e3bd4f3 | [log] [tgz] |
---|---|---|
author | Georg Brandl <georg@python.org> | Sat Oct 01 17:06:00 2005 +0000 |
committer | Georg Brandl <georg@python.org> | Sat Oct 01 17:06:00 2005 +0000 |
tree | 9e41632a3c326f4c72dec845bb6d4ceb1f0697eb | |
parent | 8b813db2ef90ae83c3c6dcaa7ac3122290c9faf4 [diff] [blame] |
Fix PyString_Format so that the "%s" format works again when Unicode is not enabled.
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 05deb3a..5797eb9 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c
@@ -4083,7 +4083,9 @@ 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;