Commit d6e53dab authored by Serhiy Storchaka's avatar Serhiy Storchaka

Fixed error message for the "u#" format code.

parent 37de910b
...@@ -968,7 +968,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, ...@@ -968,7 +968,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
Py_UNICODE **p = va_arg(*p_va, Py_UNICODE **); Py_UNICODE **p = va_arg(*p_va, Py_UNICODE **);
if (*format == '#') { if (*format == '#') {
/* "s#" or "Z#" */ /* "u#" or "Z#" */
FETCH_SIZE; FETCH_SIZE;
if (c == 'Z' && arg == Py_None) { if (c == 'Z' && arg == Py_None) {
...@@ -983,10 +983,11 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, ...@@ -983,10 +983,11 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
STORE_SIZE(len); STORE_SIZE(len);
} }
else else
return converterr("str or None", arg, msgbuf, bufsize); return converterr(c == 'Z' ? "str or None" : "str",
arg, msgbuf, bufsize);
format++; format++;
} else { } else {
/* "s" or "Z" */ /* "u" or "Z" */
if (c == 'Z' && arg == Py_None) if (c == 'Z' && arg == Py_None)
*p = NULL; *p = NULL;
else if (PyUnicode_Check(arg)) { else if (PyUnicode_Check(arg)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment