From: Andrew M. Kuchling <amk@amk.ca>
Date: Sat, 23 Dec 2000 14:11:28 +0000 (+0000)
Subject: CHange error messages for ord(), using "string" instead of "string or Unicode"
X-Git-Tag: v2.1a1~491
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f07aad171a57dcc1e661d56660eb4ca51a2944d9;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 820bdaa4b76a..0df6cb4b1446 100644
--- 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;
 }