mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

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