Implement support for uuid.UUID

README.md

@@ -93,6 +93,7 @@ The following things are supported:
  * IPv4Address, IPv6Address
  * typing.Any
  * typing.NewType
+ * uuid.UUID
 
 Unions
 ------

debian/changelog

@@ -1,3 +1,9 @@
+typedload (2.28-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Salvo 'LtWorf' Tomaselli <[email protected]>  Tue, 23 Apr 2024 14:53:56 +0200
+
 typedload (2.27-1) unstable; urgency=low
 
   * New upstream release

docs/CHANGELOG.md

@@ -1,3 +1,7 @@
+2.28
+====
+* Add support for uuid.UUID
+
 2.27
 ====
 * Add support for re.Patterns

docs/supported_types.md

@@ -452,6 +452,10 @@ Loads a string as a `Path`; when dumping it goes back to being a string.
 * `ipaddress.IPv4Interface`
 * `ipaddress.IPv6Interface`
 
+### uuid.UUID
+
+* `uuid.UUID`
+
 ```python
 In : typedload.load('10.1.1.3', IPv4Address)
 Out: IPv4Address('10.1.1.3')

tests/test_datadumper.py

@@ -23,6 +23,7 @@
 import re
 from typing import Dict, List, NamedTuple, Optional, Set, Tuple, Union
 import unittest
+from uuid import UUID
 
 from typedload import datadumper, dump, load
 
@@ -159,6 +160,9 @@ def test_ipaddress(self):
         assert dump(IPv6Network('fe80::/64')) == 'fe80::/64'
         assert dump(IPv6Interface('fe80::123/64')) == 'fe80::123/64'
 
+    def test_uuid(self):
+        assert dump(UUID('631b09cb-016e-11ef-97ce-000000000001')) == '631b09cb-016e-11ef-97ce-000000000001'
+
     def test_pattern(self):
         assert dump(re.compile(r'[bc](at|ot)\d+')) == r'[bc](at|ot)\d+'
         assert dump(re.compile(br'[bc](at|ot)\d+')) == br'[bc](at|ot)\d+'

tests/test_dataloader.py

@@ -26,6 +26,7 @@
 import typing
 from typing import Dict, List, NamedTuple, Optional, Set, Tuple, Union, Any, NewType, FrozenSet
 import unittest
+from uuid import UUID
 
 from typedload import dataloader, load, exceptions
 
@@ -522,6 +523,14 @@ def test_pattern(self):
         with self.assertRaises(exceptions.TypedloadTypeError) as e:
             assert loader.load(None, typing.Pattern)
 
+    def test_uuid(self):
+        loader = dataloader.Loader()
+        assert loader.load('631b09cb-016e-11ef-97ce-000000000001', UUID) == UUID('631b09cb-016e-11ef-97ce-000000000001')
+
+        # Invalid UUID
+        with self.assertRaises(ValueError):
+            loader.load('631b09cb-016e-11ef-97ce-00000000000', UUID)
+
     def test_ipaddress(self):
         loader = dataloader.Loader()
         assert loader.load('10.10.10.1', IPv4Address) == IPv4Address('10.10.10.1')

typedload/datadumper.py

@@ -27,6 +27,7 @@
 import pathlib
 import re
 from typing import *
+import uuid
 
 from .exceptions import TypedloadValueError
 from .typechecks import is_attrs, NONETYPE
@@ -135,6 +136,7 @@ def __init__(self, **kwargs) -> None:
                 ipaddress.IPv6Network,
                 ipaddress.IPv4Interface,
                 ipaddress.IPv6Interface,
+                uuid.UUID,
             }
 
         self.handlers = [

typedload/dataloader.py

@@ -29,6 +29,7 @@
 from pathlib import Path
 import re
 from typing import *
+import uuid
 
 from .exceptions import *
 from .typechecks import *
@@ -198,7 +199,8 @@ def __init__(self, **kwargs) -> None:
             ipaddress.IPv4Network,
             ipaddress.IPv6Network,
             ipaddress.IPv4Interface,
-            ipaddress.IPv6Interface
+            ipaddress.IPv6Interface,
+            uuid.UUID,
         }
 
         # Bah