Skip to content

gh-129349: Accept bytes in bytes.fromhex()/bytearray.fromhex() #129844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 10 commits into from
Mar 12, 2025
Merged

gh-129349: Accept bytes in bytes.fromhex()/bytearray.fromhex() #129844

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
81d7ea2
Accept bytes in bytes.fromhex()/bytearray.fromhex()
lordmauve Feb 8, 2025
ea02542
Update documentation
lordmauve Feb 8, 2025
76d28ce
Apply suggestions from @picnixz in #129844
lordmauve Feb 9, 2025
cff091c
Fix sphinx-lint
lordmauve Mar 7, 2025
be92188
Mention bytearray in docs and blurb
lordmauve Mar 7, 2025
b0e3eb5
Use buffer protocol to support all byte-like objects
lordmauve Mar 7, 2025
ef92b4e
Insert missing braces
lordmauve Mar 7, 2025
685f583
Update Doc/library/stdtypes.rst
vstinner Mar 8, 2025
f859c3c
Add test for invalid type in bytes.fromhex()
lordmauve Mar 9, 2025
31b9ab0
PEP-7
lordmauve Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add test for invalid type in bytes.fromhex()
  • Loading branch information
@lordmauve
lordmauve committed Mar 12, 2025
commit f859c3c28d8583310f149794c630de86788fd7df
5 changes: 5 additions & 0 deletions Lib/test/test_bytes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion Objects/bytesobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Comment thread
lordmauve marked this conversation as resolved.
Expand Down