From 8a0217cd8671af754d8d677d59d8a28615b28530 Mon Sep 17 00:00:00 2001
From: Eric Smith <eric@trueblade.com>
Date: Mon, 18 Feb 2008 18:07:47 +0000
Subject: Port 60893 to py3k, without unicode test.

---
 Objects/stringlib/string_format.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Objects/stringlib/string_format.h b/Objects/stringlib/string_format.h
index 70f8f13..e776242 100644
--- a/Objects/stringlib/string_format.h
+++ b/Objects/stringlib/string_format.h
@@ -493,6 +493,22 @@ render_field(PyObject *fieldobj, SubString *format_spec, OutputString *output)
     if (result == NULL)
         goto done;
 
+#if PY_VERSION_HEX >= 0x03000000
+    assert(PyString_Check(result));
+#else
+    assert(PyString_Check(result) || PyUnicode_Check(result));
+
+    /* Convert result to our type.  We could be str, and result could
+       be unicode */
+    {
+	PyObject *tmp = STRINGLIB_TOSTR(result);
+	if (tmp == NULL)
+	    goto done;
+	Py_DECREF(result);
+	result = tmp;
+    }
+#endif
+
     ok = output_data(output,
                      STRINGLIB_STR(result), STRINGLIB_LEN(result));
 done:
-- 
cgit v0.12