pythongh-125651: Fix UUID hex parsing with underscores

sevdog · Oct 17, 2024 · 6c7a1c5 · 6c7a1c5
1 parent 0cb20f2
commit 6c7a1c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py
@@ -232,6 +232,8 @@ def test_exceptions(self):
         # Badly formed hex strings.
         badvalue(lambda: self.uuid.UUID(''))
         badvalue(lambda: self.uuid.UUID('abc'))
+        badvalue(lambda: self.uuid.UUID("123_4567812345678123456781234567"))
+        badvalue(lambda: self.uuid.UUID("123_4567812345678123456781_23456"))
         badvalue(lambda: self.uuid.UUID('1234567812345678123456781234567'))
         badvalue(lambda: self.uuid.UUID('123456781234567812345678123456789'))
         badvalue(lambda: self.uuid.UUID('123456781234567812345678z2345678'))

diff --git a/Lib/uuid.py b/Lib/uuid.py
@@ -176,7 +176,7 @@ def __init__(self, hex=None, bytes=None, bytes_le=None, fields=None,
                             'or int arguments must be given')
         if hex is not None:
             hex = hex.replace('urn:', '').replace('uuid:', '')
-            hex = hex.strip('{}').replace('-', '')
+            hex = hex.strip("{}").replace("-", "").replace("_", "")
             if len(hex) != 32:
                 raise ValueError('badly formed hexadecimal UUID string')
             int = int_(hex, 16)