Fix UUID(bytes_le=16)

Author: vstinner

Lib/test/test_uuid.py

@@ -225,13 +225,15 @@ def test_exceptions(self):
         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.
         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,)))

Lib/uuid.py

@@ -160,7 +160,8 @@ 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)):
+            # Don't cast int to bytes to get a TypeError above
+            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')