summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-10-13 21:25:03 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-10-13 21:25:03 (GMT)
commit9d663d07882d4a195f6cfb93c17f79512b45d4a2 (patch)
tree3935520b262409ea1709420e79ce8f3cf6e7c284 /Python
parentd1a9cc29b9b737b63d953f6ff9464280d273c429 (diff)
downloadcpython-9d663d07882d4a195f6cfb93c17f79512b45d4a2.zip
cpython-9d663d07882d4a195f6cfb93c17f79512b45d4a2.tar.gz
cpython-9d663d07882d4a195f6cfb93c17f79512b45d4a2.tar.bz2
convertsimple(): "str without bytes" => "str without characters"
Diffstat (limited to 'Python')
-rw-r--r--Python/getargs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/getargs.c b/Python/getargs.c
index f2cc9f4..77f27be 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -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",