From a4db68622c585e1bb526ef89f5d5ccf602906110 Mon Sep 17 00:00:00 2001 From: Amaury Forgeot d'Arc Date: Fri, 4 Jul 2008 21:26:43 +0000 Subject: Issue #3280: like chr() already does, the "%c" format now accepts the full unicode range even on "narrow Unicode" builds; the result is a pair of UTF-16 surrogates. --- Python/modsupport.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'Python/modsupport.c') diff --git a/Python/modsupport.c b/Python/modsupport.c index b88c1edff2..e39c315459 100644 --- a/Python/modsupport.c +++ b/Python/modsupport.c @@ -294,21 +294,12 @@ do_mkvalue(const char **p_format, va_list *p_va, int flags) case 'C': { int i = va_arg(*p_va, int); - Py_UNICODE c; if (i < 0 || i > PyUnicode_GetMax()) { -#ifdef Py_UNICODE_WIDE PyErr_SetString(PyExc_OverflowError, - "%c arg not in range(0x110000) " - "(wide Python build)"); -#else - PyErr_SetString(PyExc_OverflowError, - "%c arg not in range(0x10000) " - "(narrow Python build)"); -#endif + "%c arg not in range(0x110000)"; return NULL; } - c = i; - return PyUnicode_FromUnicode(&c, 1); + return PyUnicode_FromOrdinal(i); } case 's': -- cgit v1.2.1