From 923d8282c771244751d483553e173a15230a84b5 Mon Sep 17 00:00:00 2001
From: Patrick Arminio <patrick.arminio@gmail.com>
Date: Sun, 31 Mar 2019 12:01:43 +0100
Subject: [PATCH] Fix duplicated ErrorType declaration (#539)

* Add failing test case

* Fix duplicated ErrorType declaration
---
 graphene_django/forms/mutation.py          |  2 +-
 graphene_django/rest_framework/mutation.py |  2 +-
 graphene_django/rest_framework/types.py    |  5 ---
 graphene_django/tests/issues/__init__.py   |  0
 graphene_django/tests/issues/test_520.py   | 44 ++++++++++++++++++++++
 graphene_django/types.py                   |  6 +++
 6 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100644 graphene_django/tests/issues/__init__.py
 create mode 100644 graphene_django/tests/issues/test_520.py

diff --git a/graphene_django/forms/mutation.py b/graphene_django/forms/mutation.py
index 63ea089..0851a75 100644
--- a/graphene_django/forms/mutation.py
+++ b/graphene_django/forms/mutation.py
@@ -14,7 +14,7 @@ from graphene.types.utils import yank_fields_from_attrs
 from graphene_django.registry import get_global_registry
 
 from .converter import convert_form_field
-from .types import ErrorType
+from ..types import ErrorType
 
 
 def fields_for_form(form, only_fields, exclude_fields):
diff --git a/graphene_django/rest_framework/mutation.py b/graphene_django/rest_framework/mutation.py
index 5e343aa..b8025f6 100644
--- a/graphene_django/rest_framework/mutation.py
+++ b/graphene_django/rest_framework/mutation.py
@@ -9,7 +9,7 @@ from graphene.relay.mutation import ClientIDMutation
 from graphene.types.objecttype import yank_fields_from_attrs
 
 from .serializer_converter import convert_serializer_field
-from .types import ErrorType
+from ..types import ErrorType
 
 
 class SerializerMutationOptions(MutationOptions):
diff --git a/graphene_django/rest_framework/types.py b/graphene_django/rest_framework/types.py
index 4c84c69..2472c32 100644
--- a/graphene_django/rest_framework/types.py
+++ b/graphene_django/rest_framework/types.py
@@ -2,11 +2,6 @@ import graphene
 from graphene.types.unmountedtype import UnmountedType
 
 
-class ErrorType(graphene.ObjectType):
-    field = graphene.String(required=True)
-    messages = graphene.List(graphene.NonNull(graphene.String), required=True)
-
-
 class DictType(UnmountedType):
     key = graphene.String()
     value = graphene.String()
diff --git a/graphene_django/tests/issues/__init__.py b/graphene_django/tests/issues/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/graphene_django/tests/issues/test_520.py b/graphene_django/tests/issues/test_520.py
new file mode 100644
index 0000000..60c5b54
--- /dev/null
+++ b/graphene_django/tests/issues/test_520.py
@@ -0,0 +1,44 @@
+# https://github.com/graphql-python/graphene-django/issues/520
+
+import datetime
+
+from django import forms
+
+import graphene
+
+from graphene import Field, ResolveInfo
+from graphene.types.inputobjecttype import InputObjectType
+from py.test import raises
+from py.test import mark
+from rest_framework import serializers
+
+from ...types import DjangoObjectType
+from ...rest_framework.models import MyFakeModel
+from ...rest_framework.mutation import SerializerMutation
+from ...forms.mutation import DjangoFormMutation
+
+
+class MyModelSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = MyFakeModel
+        fields = "__all__"
+
+
+class MyForm(forms.Form):
+    text = forms.CharField()
+
+
+def test_can_use_form_and_serializer_mutations():
+    class MyMutation(SerializerMutation):
+        class Meta:
+            serializer_class = MyModelSerializer
+
+    class MyFormMutation(DjangoFormMutation):
+        class Meta:
+            form_class = MyForm
+
+    class Mutation(graphene.ObjectType):
+        my_mutation = MyMutation.Field()
+        my_form_mutation = MyFormMutation.Field()
+
+    graphene.Schema(mutation=Mutation)
diff --git a/graphene_django/types.py b/graphene_django/types.py
index 4d55b53..3f99cef 100644
--- a/graphene_django/types.py
+++ b/graphene_django/types.py
@@ -3,6 +3,7 @@ from collections import OrderedDict
 
 from django.db.models import Model
 from django.utils.functional import SimpleLazyObject
+import graphene
 from graphene import Field
 from graphene.relay import Connection, Node
 from graphene.types.objecttype import ObjectType, ObjectTypeOptions
@@ -144,3 +145,8 @@ class DjangoObjectType(ObjectType):
             return queryset.get(pk=id)
         except cls._meta.model.DoesNotExist:
             return None
+
+
+class ErrorType(ObjectType):
+    field = graphene.String(required=True)
+    messages = graphene.List(graphene.NonNull(graphene.String), required=True)