diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2015-04-19 18:11:30 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-04-19 18:11:30 (GMT) |
| commit | d6e53dab8677fae3f6d00053b0102f8031751587 (patch) | |
| tree | 80604190fb668b91220ba2baff13f7c61225f9d1 /Python | |
| parent | 37de910b5286f768e9561599673b2cfdd4a66af5 (diff) | |
| download | cpython-d6e53dab8677fae3f6d00053b0102f8031751587.zip cpython-d6e53dab8677fae3f6d00053b0102f8031751587.tar.gz cpython-d6e53dab8677fae3f6d00053b0102f8031751587.tar.bz2 | |
Fixed error message for the "u#" format code.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/getargs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Python/getargs.c b/Python/getargs.c index 3f47b21..6902d13 100644 --- a/Python/getargs.c +++ b/Python/getargs.c @@ -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 **); if (*format == '#') { - /* "s#" or "Z#" */ + /* "u#" or "Z#" */ FETCH_SIZE; if (c == 'Z' && arg == Py_None) { @@ -983,10 +983,11 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, STORE_SIZE(len); } else - return converterr("str or None", arg, msgbuf, bufsize); + return converterr(c == 'Z' ? "str or None" : "str", + arg, msgbuf, bufsize); format++; } else { - /* "s" or "Z" */ + /* "u" or "Z" */ if (c == 'Z' && arg == Py_None) *p = NULL; else if (PyUnicode_Check(arg)) { |