Handle UUIDField value more gracefully

boomletsgo · Sep 18, 2017 · ae54043 · ae54043
1 parent 050471d
commit ae54043
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/declaration/fields.py b/declaration/fields.py
@@ -29,10 +29,11 @@ def encode(self, value):
 class UUIDField(GenericField):
 
     def parse(self, value):
-        try:
-            value = uuid.UUID(value, version=4)
-        except ValueError:
-            pass
+        if not isinstance(value, uuid.UUID):
+            try:
+                value = uuid.UUID(value, version=4)
+            except ValueError:
+                pass
 
         return value
 

diff --git a/declaration/tests/test_fields.py b/declaration/tests/test_fields.py
@@ -68,6 +68,12 @@ def test_uuid_field_converts(self):
 
         assert converted == field.parse(value)
 
+    def test_uuid_field_passes_through_if_already_uuid(self):
+        field = fields.UUIDField()
+        value = uuid.UUID("c3864285-1f1e-4c0c-bd95-ad5a8dbf3232", version=4)
+
+        assert value == field.parse(value)
+
     def test_uuid_field_fails_if_not_uuid(self):
         field = fields.UUIDField()
         value = "garbage"

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@
     author='Jordan Ambra',
     author_email='jordan@serenitysoftware.io',
     url='https://github.com/boomletsgo/declaration',
-    version='0.1.2',
+    version='0.1.3',
     classifiers=classifiers,
     description='Base classes and fields for declarative programming, like Django ORM',
     keywords='declarative declaration metaclass',