From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 13 Oct 2011 21:25:03 +0000 (+0200)
Subject: convertsimple(): "str without bytes" => "str without characters"
X-Git-Tag: v3.3.0a1~1177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d663d07882d4a195f6cfb93c17f79512b45d4a2;p=python

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

diff --git a/Python/getargs.c b/Python/getargs.c
index f2cc9f4509..77f27bebc9 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",