Drop UUID field condition check

carltongibson · Oct 19, 2015 · 2733907 · 2733907
1 parent 3d4a4e6
commit 2733907
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 18 deletions.
diff --git a/django_filters/fields.py b/django_filters/fields.py
@@ -11,8 +11,6 @@
 
 from .widgets import RangeWidget, LookupTypeWidget
 
-from django.forms import UUIDField
-
 
 class RangeField(forms.MultiValueField):
     widget = RangeWidget

diff --git a/django_filters/filters.py b/django_filters/filters.py
@@ -12,7 +12,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from .fields import (
-    RangeField, LookupTypeField, Lookup, DateRangeField, TimeRangeField, IsoDateTimeField, UUIDField)
+    RangeField, LookupTypeField, Lookup, DateRangeField, TimeRangeField, IsoDateTimeField)
 
 
 __all__ = [
@@ -107,7 +107,7 @@ class TypedChoiceFilter(Filter):
 
 
 class UUIDFilter(Filter):
-    field_class = UUIDField
+    field_class = forms.UUIDField
 
 
 class MultipleChoiceFilter(Filter):

diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -12,23 +12,13 @@
 
 from django_filters.widgets import RangeWidget
 from django_filters.fields import (
-    RangeField, LookupTypeField, Lookup, DateRangeField, TimeRangeField, IsoDateTimeField, UUIDField)
+    RangeField, LookupTypeField, Lookup, DateRangeField, TimeRangeField, IsoDateTimeField)
 
 
 def to_d(float_value):
     return decimal.Decimal('%.2f' % float_value)
 
 
-class UUIDFieldTests(TestCase):
-
-    def test_field(self):
-        if django.VERSION < (1, 8):
-            with self.assertRaises(ImportError):
-                UUIDField()
-        else:
-            self.assertIs(UUIDField, forms.UUIDField)
-
-
 class RangeFieldTests(TestCase):
 
     def test_field(self):

diff --git a/tests/test_filters.py b/tests/test_filters.py
@@ -15,8 +15,7 @@
     RangeField,
     DateRangeField,
     TimeRangeField,
-    LookupTypeField,
-    UUIDField)
+    LookupTypeField)
 from django_filters.filters import (
     Filter,
     CharFilter,
@@ -203,7 +202,7 @@ def test_default_field(self):
         if not django.VERSION < (1, 8):
             f = UUIDFilter()
             field = f.field
-            self.assertIsInstance(field, UUIDField)
+            self.assertIsInstance(field, forms.UUIDField)
         else:
             with self.assertRaises(ImportError):
                 UUIDFilter().field