CHange error messages for ord(), using "string" instead of "string or Unicode"

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 820bdaa4b76a309d9e57ddab54991dfd37d75b68..0df6cb4b1446f76a0951859e614d0dfc09bab1ea 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1524,13 +1524,14 @@ builtin_ord(PyObject *self, PyObject *args)
                }
        } else {
                PyErr_Format(PyExc_TypeError,
-                            "ord() expected string or Unicode character, " \
+                            "ord() expected string of length 1, but " \
                             "%.200s found", obj->ob_type->tp_name);
                return NULL;
        }
 
        PyErr_Format(PyExc_TypeError, 
-                    "ord() expected a character, length-%d string found",
+                    "ord() expected a character, "
+                    "but string of length %d found",
                     size);
        return NULL;
 }