From 463c1f98df4451b81e0103aa5c189917e3f3b1e1 Mon Sep 17 00:00:00 2001
From: Adam Charnock <adam@adamcharnock.com>
Date: Thu, 3 Dec 2015 13:37:29 +0000
Subject: [PATCH] Relocating UUID form field import code from converter.py to
form_converter.py
---
graphene/contrib/django/converter.py | 10 +++-------
graphene/contrib/django/form_converter.py | 8 ++++++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/graphene/contrib/django/converter.py b/graphene/contrib/django/converter.py
index cd9fa7ab..a0a062cf 100644
--- a/graphene/contrib/django/converter.py
+++ b/graphene/contrib/django/converter.py
@@ -5,14 +5,10 @@ from singledispatch import singledispatch
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)
diff --git a/graphene/contrib/django/form_converter.py b/graphene/contrib/django/form_converter.py
index 10f52608..626f77e5 100644
--- a/graphene/contrib/django/form_converter.py
+++ b/graphene/contrib/django/form_converter.py
@@ -3,8 +3,12 @@ from django.forms.fields import BaseTemporalField
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)