summaryrefslogtreecommitdiff
path: root/Objects/stringobject.c
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2005-10-01 17:06:00 +0000
committerGeorg Brandl <georg@python.org>2005-10-01 17:06:00 +0000
commite4f83c1d7c69e4141061aaf36063da0e229514ed (patch)
tree4b7ac96a3972a929da06d1f16f6e07686b4f702f /Objects/stringobject.c
parenta3c8fc7fc661757d6bfd0ae08ce1eeb5edb23863 (diff)
downloadcpython-e4f83c1d7c69e4141061aaf36063da0e229514ed.tar.gz
Fix PyString_Format so that the "%s" format works again when Unicode is not
enabled.
Diffstat (limited to 'Objects/stringobject.c')
-rw-r--r--Objects/stringobject.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 05deb3a98c..5797eb91ef 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;