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.
diff --git a/Python/modsupport.c b/Python/modsupport.c
index b88c1ed..e39c315 100644
--- a/Python/modsupport.c
+++ b/Python/modsupport.c
@@ -294,21 +294,12 @@
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':