Relocating UUID form field import code from converter.py to form_converter.py

Author: adamcharnock

graphene/contrib/django/converter.py

@@ -5,14 +5,10 @@
 from ...core.types.scalars import ID, Boolean, Float, Int, String
 
 try:
-    UUIDModelField = models.UUIDField
-    UUIDFormField = forms.UUIDField
+    UUIDField = models.UUIDField
 except AttributeError:
     # Improved compatibility for Django 1.6
-    class UUIDModelField(object):
-        pass
-
-    class UUIDFormField(object):
+    class UUIDField(object):
         pass
 
 
@@ -29,7 +25,7 @@ def convert_django_field(field):
 @convert_django_field.register(models.EmailField)
 @convert_django_field.register(models.SlugField)
 @convert_django_field.register(models.URLField)
-@convert_django_field.register(UUIDModelField)
+@convert_django_field.register(UUIDField)
 def convert_field_to_string(field):
     return String(description=field.help_text)
 

graphene/contrib/django/form_converter.py

@@ -3,8 +3,12 @@
 from singledispatch import singledispatch
 
 from graphene import String, Int, Boolean, Float, ID
-from .converter import UUIDFormField
 
+try:
+    UUIDField = forms.UUIDField
+except AttributeError:
+    class UUIDField(object):
+        pass
 
 @singledispatch
 def convert_form_field(field):
@@ -23,7 +27,7 @@ def convert_form_field(field):
 @convert_form_field.register(forms.ChoiceField)
 @convert_form_field.register(forms.RegexField)
 @convert_form_field.register(forms.Field)
-@convert_form_field.register(UUIDFormField)
+@convert_form_field.register(UUIDField)
 def convert_form_field_to_string(field):
     return String(description=field.help_text)