From d81892e0d4fdd5f70c702810877f14c4f89ded41 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 18 Feb 2017 14:20:23 -0800
Subject: [PATCH] Fixed lint and registry error description

---
 graphene_django/registry.py            | 11 +++++++++--
 graphene_django/tests/test_registry.py |  9 ++++++---
 graphene_django/types.py               |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/graphene_django/registry.py b/graphene_django/registry.py
index 33b05d5..a2021ff 100644
--- a/graphene_django/registry.py
+++ b/graphene_django/registry.py
@@ -9,8 +9,15 @@ class Registry(object):
         model = cls._meta.model
         assert self._registry.get(model, cls) == cls, (
             'Django Model "{}.{}" already associated with {}. '
-            'You can use a different registry for {} or skip the global Registry with "{}.Meta.skip_global_registry = True".'
-        ).format(model._meta.app_label, model._meta.object_name, repr(self.get_type_for_model(cls._meta.model)), repr(cls), cls)
+            'You can use a different registry for {} or skip '
+            'the global Registry with "{}.Meta.skip_global_registry = True".'
+        ).format(
+            model._meta.app_label,
+            model._meta.object_name,
+            repr(self.get_type_for_model(cls._meta.model)),
+            repr(cls),
+            cls
+        )
         assert issubclass(
             cls, DjangoObjectType), 'Only DjangoObjectTypes can be registered, received "{}"'.format(
             cls.__name__)
diff --git a/graphene_django/tests/test_registry.py b/graphene_django/tests/test_registry.py
index a7327bf..6527b32 100644
--- a/graphene_django/tests/test_registry.py
+++ b/graphene_django/tests/test_registry.py
@@ -27,6 +27,9 @@ def test_registry_multiple_types():
         class Meta:
             model = ReporterModel
 
+    class Reporter2(object):
+        pass
+
     with raises(Exception) as exc_info:
         class Reporter2(DjangoObjectType):
             '''Reporter2 description'''
@@ -34,10 +37,10 @@ def test_registry_multiple_types():
                 model = ReporterModel
 
     assert str(exc_info.value) == (
-      'Django Model "tests.Reporter" already associated with <class \'graphene_django.tests.test_registry.Reporter\'>. '
-      'You can use a different registry for <class \'graphene_django.tests.test_registry.Reporter2\'> '
+      'Django Model "tests.Reporter" already associated with {}. '
+      'You can use a different registry for {} '
       'or skip the global Registry with "Reporter2.Meta.skip_global_registry = True".'
-    )
+    ).format(repr(Reporter), repr(Reporter2))
 
 
 def test_registry_multiple_types_dont_collision_if_skip_global_registry():
diff --git a/graphene_django/types.py b/graphene_django/types.py
index 8c52298..f2114c5 100644
--- a/graphene_django/types.py
+++ b/graphene_django/types.py
@@ -72,7 +72,7 @@ class DjangoObjectTypeMeta(ObjectTypeMeta):
             attrs.pop('Meta', None),
             **defaults
         )
-        # If the DjangoObjectType wants to skip the registry
+        # If the DjangoObjectType wants to skip the global registry
         # we will automatically create one, so the model is isolated
         # there.
         if options.skip_global_registry: