Add test for invalid type in bytes.fromhex()

lordmauve · lordmauve · commit 75be6ba8751b · 2025-03-10T20:07:22.000Z
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
@@ -473,6 +473,11 @@ def test_fromhex(self):
             self.assertRaises(ValueError, self.type2test.fromhex, b)
 
         self.assertEqual(self.type2test.fromhex('0000'), b'\0\0')
+        with self.assertRaisesRegex(
+            TypeError,
+            r'fromhex\(\) argument must be str or bytes-like, not tuple',
+        ):
+            self.type2test.fromhex(())
         self.assertRaises(ValueError, self.type2test.fromhex, 'a')
         self.assertRaises(ValueError, self.type2test.fromhex, 'rt')
         self.assertRaises(ValueError, self.type2test.fromhex, '1a b cd')
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
@@ -2547,7 +2547,7 @@ _PyBytes_FromHex(PyObject *string, int use_bytearray)
     }
     else {
         PyErr_Format(PyExc_TypeError,
-                     "fromhex() argument must be str or bytes, not %T",
+                     "fromhex() argument must be str or bytes-like, not %T",
                      string);
         return NULL;
     }

Original file line number	Diff line number	Diff line change
`@@ -2547,7 +2547,7 @@ _PyBytes_FromHex(PyObject *string, int use_bytearray)`
`2547`	`2547`	`}`
`2548`	`2548`	`else {`
`2549`	`2549`	`PyErr_Format(PyExc_TypeError,`
`2550`		`- "fromhex() argument must be str or bytes, not %T",`
	`2550`	`+ "fromhex() argument must be str or bytes-like, not %T",`
`2551`	`2551`	`string);`
`2552`	`2552`	`return NULL;`
`2553`	`2553`	`}`