Merge branch '335-uuid'

aholmberg · aholmberg · commit b194fec0e0fd · 2015-05-29T08:38:28.000-05:00
diff --git a/cassandra/cqlengine/columns.py b/cassandra/cqlengine/columns.py
@@ -15,7 +15,6 @@
 from copy import deepcopy, copy
 from datetime import date, datetime
 import logging
-import re
 import six
 import warnings
 
@@ -518,18 +517,19 @@ class UUID(Column):
     """
     db_type = 'uuid'
 
-    re_uuid = re.compile(r'[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}')
-
     def validate(self, value):
         val = super(UUID, self).validate(value)
         if val is None:
             return
         from uuid import UUID as _UUID
         if isinstance(val, _UUID):
             return val
-        if isinstance(val, six.string_types) and self.re_uuid.match(val):
-            return _UUID(val)
-        raise ValidationError("{} {} is not a valid uuid".format(self.column_name, value))
+        if isinstance(val, six.string_types):
+            try:
+                return _UUID(val)
+            except ValueError:
+                raise ValidationError("{} {} is not a valid uuid".format(
+                    self.column_name, value))
 
     def to_python(self, value):
         return self.validate(value)
diff --git a/tests/integration/cqlengine/columns/test_validation.py b/tests/integration/cqlengine/columns/test_validation.py
@@ -240,6 +240,13 @@ def test_uuid_str_no_dashes(self):
         t1 = self.UUIDTest.get(test_id=1)
         assert a_uuid == t1.a_uuid
 
+    def test_uuid_with_upcase(self):
+        a_uuid = uuid4()
+        val = str(a_uuid).upper()
+        t0 = self.UUIDTest.create(test_id=0, a_uuid=val)
+        t1 = self.UUIDTest.get(test_id=0)
+        assert a_uuid == t1.a_uuid
+
 class TestTimeUUID(BaseCassEngTestCase):
     class TimeUUIDTest(Model):
 
