From 70a4bd13c141027396dcdde2ca46cc865c452866 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 2 Jan 2016 21:26:13 +0100
Subject: [PATCH] Fixed non-removed code from django filters and some PEP8
 errors

---
 graphene/contrib/django/filter/__init__.py    |  4 +-
 .../django/filter/tests/test_fields.py        |  4 +-
 .../contrib/django/tests/test_resolvers.py    | 60 -------------------
 setup.cfg                                     |  2 +-
 4 files changed, 4 insertions(+), 66 deletions(-)
 delete mode 100644 graphene/contrib/django/tests/test_resolvers.py

diff --git a/graphene/contrib/django/filter/__init__.py b/graphene/contrib/django/filter/__init__.py
index 95b28aff..51a04b7e 100644
--- a/graphene/contrib/django/filter/__init__.py
+++ b/graphene/contrib/django/filter/__init__.py
@@ -8,8 +8,6 @@ if not DJANGO_FILTER_INSTALLED:
 
 from .fields import DjangoFilterConnectionField
 from .filterset import GrapheneFilterSet, GlobalIDFilter, GlobalIDMultipleChoiceFilter
-from .resolvers import FilterConnectionResolver
 
 __all__ = ['DjangoFilterConnectionField', 'GrapheneFilterSet',
-           'GlobalIDFilter', 'GlobalIDMultipleChoiceFilter',
-           'FilterConnectionResolver']
+           'GlobalIDFilter', 'GlobalIDMultipleChoiceFilter']
diff --git a/graphene/contrib/django/filter/tests/test_fields.py b/graphene/contrib/django/filter/tests/test_fields.py
index c16610aa..56d69dc8 100644
--- a/graphene/contrib/django/filter/tests/test_fields.py
+++ b/graphene/contrib/django/filter/tests/test_fields.py
@@ -185,8 +185,8 @@ def test_filter_filterset_related_results():
 
     r1 = Reporter.objects.create(first_name='r1', last_name='r1', email='r1@test.com')
     r2 = Reporter.objects.create(first_name='r2', last_name='r2', email='r2@test.com')
-    a1 = Article.objects.create(headline='a1', pub_date=datetime.now(), reporter=r1)
-    a2 = Article.objects.create(headline='a2', pub_date=datetime.now(), reporter=r2)
+    Article.objects.create(headline='a1', pub_date=datetime.now(), reporter=r1)
+    Article.objects.create(headline='a2', pub_date=datetime.now(), reporter=r2)
 
     query = '''
     query {
diff --git a/graphene/contrib/django/tests/test_resolvers.py b/graphene/contrib/django/tests/test_resolvers.py
deleted file mode 100644
index db1610c9..00000000
--- a/graphene/contrib/django/tests/test_resolvers.py
+++ /dev/null
@@ -1,60 +0,0 @@
-from django.db.models import Manager
-from django.db.models.query import QuerySet
-
-from graphene.contrib.django import DjangoNode
-from graphene.contrib.django.resolvers import SimpleQuerySetConnectionResolver
-from graphene.contrib.django.tests.models import Article, Reporter
-
-
-class ReporterNode(DjangoNode):
-
-    class Meta:
-        model = Reporter
-
-
-class ArticleNode(DjangoNode):
-
-    class Meta:
-        model = Article
-
-
-def test_simple_resolve():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = SimpleQuerySetConnectionResolver(ReporterNode, on='articles')
-    resolved = resolver(inst=reporter, args={}, info=None)
-    assert isinstance(resolved, QuerySet), 'Did not resolve to a queryset'
-
-
-def test_simple_get_manager_related():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = SimpleQuerySetConnectionResolver(ReporterNode, on='articles')
-    resolver(inst=reporter, args={}, info=None)
-    assert resolver.get_manager().instance == reporter, 'Resolver did not return a RelatedManager'
-
-
-def test_simple_get_manager_all():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = SimpleQuerySetConnectionResolver(ReporterNode)
-    resolver(inst=reporter, args={}, info=None)
-    assert isinstance(resolver.get_manager(), Manager), 'Resolver did not return a Manager'
-
-
-def test_simple_filter():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = SimpleQuerySetConnectionResolver(ReporterNode)
-    resolved = resolver(inst=reporter, args={
-        'first_name': 'Elmo'
-    }, info=None)
-    assert '"first_name" = Elmo' in str(resolved.query)
-    assert 'ORDER BY' not in str(resolved.query)
-
-
-def test_simple_order():
-    reporter = Reporter(id=1, first_name='Cookie Monster')
-    resolver = SimpleQuerySetConnectionResolver(ReporterNode)
-    resolved = resolver(inst=reporter, args={
-        'order_by': 'last_name'
-    }, info=None)
-    assert 'WHERE' not in str(resolved.query)
-    assert 'ORDER BY' in str(resolved.query)
-    assert '"last_name" ASC' in str(resolved.query)
diff --git a/setup.cfg b/setup.cfg
index d9e6b06f..2cd61786 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [flake8]
-exclude = setup.py,docs/*
+exclude = setup.py,docs/*,examples/cookbook_django/*
 max-line-length = 120
 
 [coverage:run]