Revert r56044 (which changed the %c format specifier to accept a
unicode char into an int variable) and add %C which does this.
diff --git a/Python/getargs.c b/Python/getargs.c
index 1730bff..ce1fef7 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -761,6 +761,19 @@
#endif /* WITHOUT_COMPLEX */
case 'c': {/* char */
+ char *p = va_arg(*p_va, char *);
+ if (PyString_Check(arg) && PyString_Size(arg) == 1)
+ *p = PyString_AS_STRING(arg)[0];
+ else if (PyUnicode_Check(arg) &&
+ PyUnicode_GET_SIZE(arg) == 1 &&
+ PyUnicode_AS_UNICODE(arg)[0] < 256)
+ *p = PyUnicode_AS_UNICODE(arg)[0];
+ else
+ return converterr("char < 256", arg, msgbuf, bufsize);
+ break;
+ }
+
+ case 'C': {/* unicode char */
int *p = va_arg(*p_va, int *);
if (PyString_Check(arg) && PyString_Size(arg) == 1)
*p = PyString_AS_STRING(arg)[0];
diff --git a/Python/modsupport.c b/Python/modsupport.c
index ba46409..330da5f 100644
--- a/Python/modsupport.c
+++ b/Python/modsupport.c
@@ -385,6 +385,12 @@
case 'c':
{
+ char p[1];
+ p[0] = (char)va_arg(*p_va, int);
+ return PyString_FromStringAndSize(p, 1);
+ }
+ case 'C':
+ {
int i = va_arg(*p_va, int);
Py_UNICODE c;
if (i < 0 || i > PyUnicode_GetMax()) {