bpo-29729: uuid.UUID now accepts bytes-like object by vstinner · Pull Request #3801 · python/cpython · GitHub
Skip to content

bpo-29729: uuid.UUID now accepts bytes-like object #3801

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

Closed
vstinner wants to merge 8 commits into from
Closed

bpo-29729: uuid.UUID now accepts bytes-like object #3801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9038f43
bpo-29729: uuid.UUID now accepts bytes-like object
vstinner Sep 28, 2017
c35cb1d
Accept also bytes-like for bytes_le
vstinner Sep 28, 2017
58d013c
Update the NEWS entry.
vstinner Sep 28, 2017
d7262ad
Merge branch 'master' into uuid_bytes
vstinner Sep 28, 2017
a169e89
Fix UUID(bytes_le=16)
vstinner Sep 28, 2017
583c9fc
Remove a comment
vstinner Oct 2, 2017
f437da5
Merge branch 'master' into uuid_bytes
vstinner Oct 3, 2017
bf919ce
Repeat that objects must have a length of 16
vstinner Oct 3, 2017
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
4 changes: 4 additions & 0 deletions Doc/library/uuid.rst
View file
Open in desktop
27 changes: 21 additions & 6 deletions Lib/test/test_uuid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,20 @@ def test_exceptions(self):
badvalue(lambda: self.uuid.UUID('123456781234567812345678z2345678'))

# Badly formed bytes.
badvalue(lambda: self.uuid.UUID(bytes='abc'))
badvalue(lambda: self.uuid.UUID(bytes='\0'*15))
badvalue(lambda: self.uuid.UUID(bytes='\0'*17))
badtype(lambda: self.uuid.UUID(bytes='unicode'))
badtype(lambda: self.uuid.UUID(bytes='u'*16))
badvalue(lambda: self.uuid.UUID(bytes=b'abc'))
badvalue(lambda: self.uuid.UUID(bytes=b'\0'*15))
badvalue(lambda: self.uuid.UUID(bytes=b'\0'*17))
badtype(lambda: self.uuid.UUID(bytes=16))

# Badly formed bytes_le.
badvalue(lambda: self.uuid.UUID(bytes_le='abc'))
badvalue(lambda: self.uuid.UUID(bytes_le='\0'*15))
badvalue(lambda: self.uuid.UUID(bytes_le='\0'*17))
badtype(lambda: self.uuid.UUID(bytes_le='unicode'))
badtype(lambda: self.uuid.UUID(bytes_le='u'*16))
badvalue(lambda: self.uuid.UUID(bytes_le=b'abc'))
badvalue(lambda: self.uuid.UUID(bytes_le=b'\0'*15))
badvalue(lambda: self.uuid.UUID(bytes_le=b'\0'*17))
badtype(lambda: self.uuid.UUID(bytes_le=16))

# Badly formed fields.
badvalue(lambda: self.uuid.UUID(fields=(1,)))
Expand Down Expand Up @@ -476,6 +482,15 @@ def testIssue8621(self):

self.assertNotEqual(parent_value, child_value)

def test_bytes_like(self):
u = self.uuid.uuid4()

self.assertEqual(self.uuid.UUID(bytes=memoryview(u.bytes)), u)
self.assertEqual(self.uuid.UUID(bytes=bytearray(u.bytes)), u)

self.assertEqual(self.uuid.UUID(bytes_le=memoryview(u.bytes_le)), u)
self.assertEqual(self.uuid.UUID(bytes_le=bytearray(u.bytes_le)), u)


class TestUUIDWithoutExtModule(BaseTestUUID, unittest.TestCase):
uuid = py_uuid
Expand Down
7 changes: 5 additions & 2 deletions Lib/uuid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,18 @@ def __init__(self, hex=None, bytes=None, bytes_le=None, fields=None,
raise ValueError('badly formed hexadecimal UUID string')
int = int_(hex, 16)
if bytes_le is not None:
if not isinstance(bytes_le, (bytes_, bytearray, int_)):
bytes_le = bytes_(bytes_le)
if len(bytes_le) != 16:
raise ValueError('bytes_le is not a 16-char string')
bytes = (bytes_le[4-1::-1] + bytes_le[6-1:4-1:-1] +
bytes_le[8-1:6-1:-1] + bytes_le[8:])
if bytes is not None:
int = int_.from_bytes(bytes, byteorder='big')
# test length after the conversion to raise a TypeError exception
# if 'bytes' type is str even if 'bytes' length is not 16
if len(bytes) != 16:

@pitrou pitrou Oct 4, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

>>> a = array.array('i', [-1]*4)
>>> x = int.from_bytes(a, byteorder='big')
>>> len(a)
4
>>> x.bit_length()/8
16.0

And conversely:

>>> a = array.array('i', [-1]*16)
>>> x = int.from_bytes(a, byteorder='big')
>>> len(a)
16
>>> x.bit_length()/8
64.0

raise ValueError('bytes is not a 16-char string')
assert isinstance(bytes, bytes_), repr(bytes)
int = int_.from_bytes(bytes, byteorder='big')
if fields is not None:
if len(fields) != 6:
raise ValueError('fields is not a 6-tuple')
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2017-09-28-16-21-13.bpo-29729.skDkJA.rst
View file
Open in desktop