From: Barry Warsaw <barry@python.org>
Date: Tue, 15 Aug 2000 06:59:58 +0000 (+0000)
Subject: binascii_unhexlify(): Better error message, courtesy effbot.
X-Git-Tag: v2.0b1~445
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16168477ebed81305c7b23f9c61fd558ba6e9f81;p=python

binascii_unhexlify(): Better error message, courtesy effbot.
---

diff --git a/Modules/binascii.c b/Modules/binascii.c
index 89ccc79c6e..1fe0663574 100644
--- a/Modules/binascii.c
+++ b/Modules/binascii.c
@@ -944,12 +944,12 @@ binascii_unhexlify(PyObject *self, PyObject *args)
 	if (!PyArg_ParseTuple(args, "s#:a2b_hex", &argbuf, &arglen))
 		return NULL;
 
-	/* XXX What should we do about odd-lengthed strings?  Should we add
-	 * an implicit leading zero, or a trailing zero?  For now, raise an
-	 * exception.
+	/* XXX What should we do about strings with an odd length?  Should
+	 * we add an implicit leading zero, or a trailing zero?  For now,
+	 * raise an exception.
 	 */
 	if (arglen % 2) {
-		PyErr_SetString(PyExc_TypeError, "odd lengthed string");
+		PyErr_SetString(PyExc_TypeError, "Odd-length string");
 		return NULL;
 	}
 
@@ -965,7 +965,7 @@ binascii_unhexlify(PyObject *self, PyObject *args)
 		int bot = to_int(Py_CHARMASK(argbuf[i+1]));
 		if (top == -1 || bot == -1) {
 			PyErr_SetString(PyExc_TypeError,
-					"non-hexadecimal digit found");
+					"Non-hexadecimal digit found");
 			goto finally;
 		}
 		retbuf[j++] = (top << 4) + bot;