From d57b7af4928b0f0661606d6a0819a2a920e3bb6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Walter=20D=C3=B6rwald?= <walter@livinglogic.de>
Date: Mon, 31 Mar 2003 18:07:50 +0000
Subject: Fix PyString_Format() so that '%c' % u'a' returns u'a' instead of
 raising a TypeError. (From SF patch #710127)

Add tests to verify this is fixed.

Add various tests for '%c' % int.
---
 Objects/stringobject.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'Objects/stringobject.c')

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 9598ffb3cf..2613c626e2 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -3933,6 +3933,13 @@ PyString_Format(PyObject *format, PyObject *args)
 					fill = '0';
 				break;
 			case 'c':
+#ifdef Py_USING_UNICODE
+				if (PyUnicode_Check(v)) {
+					fmt = fmt_start;
+					argidx = argidx_start;
+					goto unicode;
+				}
+#endif
 				pbuf = formatbuf;
 				len = formatchar(pbuf, sizeof(formatbuf), v);
 				if (len < 0)
-- 
cgit v1.2.1