mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

convertsimple(): "str without bytes" => "str without characters"

Browse source
This commit is contained in:
Victor Stinner 2011-10-13 23:25:03 +02:00
parent d1a9cc29b9
commit 9d663d0788
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Python/getargs.c
View file

@ -961,8 +961,8 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
arg, msgbuf, bufsize);
if (*p != NULL && sarg != NULL && (Py_ssize_t) strlen(*p) != len)
return converterr(
c == 'z' ? "str without null bytes or None"
: "str without null bytes",
c == 'z' ? "str without null characters or None"
: "str without null characters",
arg, msgbuf, bufsize);
}
break;
@ -1002,7 +1002,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
RETURN_ERR_OCCURRED;
if (Py_UNICODE_strlen(*p) != len)
return converterr(
"str without null character or None",
"str without null characters or None",
arg, msgbuf, bufsize);
} else
return converterr(c == 'Z' ? "str or None" : "str",