Added code to correct combining str and unicode in ''.format(). Added test case.
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 26a57cc..ccb9411f 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -1088,6 +1088,15 @@
self.assertRaises(ValueError, format, "", "-")
self.assertRaises(ValueError, "{0:=s}".format, '')
+ # test combining string and unicode
+ self.assertEqual(u"foo{0}".format('bar'), u'foobar')
+ # This will try to convert the argument from unicode to str, which
+ # will succeed
+ self.assertEqual("foo{0}".format(u'bar'), 'foobar')
+ # This will try to convert the argument from unicode to str, which
+ # will fail
+ self.assertRaises(UnicodeEncodeError, "foo{0}".format, u'\u1000bar')
+
def test_main():
test_support.run_unittest(__name__)
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 @@
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: