fix get_db_prep_value when value is unicode

uuidfield/fields.py

@@ -46,13 +46,21 @@ class UUIDField(Field):
     __metaclass__ = SubfieldBase
 
     def __init__(self, version=4, node=None, clock_seq=None,
-            namespace=None, name=None, auto=False, hyphenate=False, *args, **kwargs):
-        assert version in (1, 3, 4, 5), "UUID version %s is not supported." % version
+                 namespace=None, name=None, auto=False, hyphenate=False,
+                 *args, **kwargs):
+        assert version in (1, 3, 4, 5), "UUID version {ver} is not supported."\
+            .format(ver=version)
         self.auto = auto
         self.version = version
         self.hyphenate = hyphenate
-        # We store UUIDs in hex format, which is fixed at 32 characters.
-        kwargs['max_length'] = 32
+
+        if hyphenate:
+            # We store UUIDs in string format, which is fixed at 36 characters.
+            kwargs['max_length'] = 36
+        else:
+            # We store UUIDs in hex format, which is fixed at 32 characters.
+            kwargs['max_length'] = 32
+
         if auto:
             # Do not let the user edit UUIDs if they are auto-assigned.
             kwargs['editable'] = False
@@ -111,9 +119,9 @@ def get_db_prep_value(self, value, connection, prepared=False):
         """
         if isinstance(value, uuid.UUID):
             value = str(value)
-        if isinstance(value, str):
+        if isinstance(value, basestring):
             if '-' in value:
-                return value.replace('-', '')
+                value = value.replace('-', '')
         return value
 
     def value_to_string(self, obj):

uuidfield/tests/tests.py

@@ -63,3 +63,13 @@ def test_can_use_hyphenated_uuids_in_filter_and_get(self):
         filtered_obj = AutoUUIDField.objects.filter(uuid=obj_uuid)[0]
         self.assertEqual(inserted_obj.uuid, obj_uuid)
         self.assertEqual(filtered_obj.uuid, obj_uuid)
+
+        inserted_obj = AutoUUIDField.objects.get(uuid=str(obj_uuid))
+        filtered_obj = AutoUUIDField.objects.filter(uuid=str(obj_uuid))[0]
+        self.assertEqual(inserted_obj.uuid, obj_uuid)
+        self.assertEqual(filtered_obj.uuid, obj_uuid)
+
+        inserted_obj = AutoUUIDField.objects.get(uuid=unicode(obj_uuid))
+        filtered_obj = AutoUUIDField.objects.filter(uuid=unicode(obj_uuid))[0]
+        self.assertEqual(inserted_obj.uuid, obj_uuid)
+        self.assertEqual(filtered_obj.uuid, obj_uuid)