Kaydet (Commit) 9d663d07 authored tarafından Victor Stinner's avatar Victor Stinner

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

üst d1a9cc29
...@@ -961,8 +961,8 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, ...@@ -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, ...@@ -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",
......
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