Skip to content

Commit 862bfd5

Browse files
committed
gh-127740: Improve error messages as suggested by @hauntsaninja
1 parent 7c819c1 commit 862bfd5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Lib/test/test_bytes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,10 +460,10 @@ def test_fromhex(self):
460460
self.assertRaises(ValueError, self.type2test.fromhex, '12 \x00 34')
461461

462462
# For odd number of character(s)
463-
for value in ("a", "a ", " a"," a ", "aaa", "aaa ", " aaa", " aaa ", " aa a "):
463+
for value in ("a", "a ", " a"," a ", "aaa", "aaa ", " aaa", " aaa "):
464464
with self.assertRaises(ValueError) as cm:
465465
self.type2test.fromhex(value)
466-
self.assertIn("fromhex() arg must be of even length", str(cm.exception))
466+
self.assertIn("fromhex() arg must contain an even number of hexadecimal digits", str(cm.exception))
467467

468468
for data, pos in (
469469
# invalid first hexadecimal character

Objects/bytesobject.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2562,7 +2562,7 @@ _PyBytes_FromHex(PyObject *string, int use_bytearray)
25622562
error:
25632563
if (invalid_char == -1) {
25642564
PyErr_SetString(PyExc_ValueError,
2565-
"fromhex() arg must be of even length");
2565+
"fromhex() arg must contain an even number of hexadecimal digits");
25662566
} else {
25672567
PyErr_Format(PyExc_ValueError,
25682568
"non-hexadecimal number found in "

0 commit comments

Comments
 (0)