Fixed pep8 errors

Author: syrusakbary

examples/flask_sqlalchemy/schema.py

@@ -1,7 +1,6 @@
 import graphene
 from graphene import relay
-from graphene_sqlalchemy import (SQLAlchemyConnectionField,
-                                 SQLAlchemyObjectType)
+from graphene_sqlalchemy import SQLAlchemyConnectionField, SQLAlchemyObjectType
 from models import Department as DepartmentModel
 from models import Employee as EmployeeModel
 from models import Role as RoleModel

graphene_sqlalchemy/__init__.py

@@ -5,8 +5,8 @@
     SQLAlchemyConnectionField
 )
 from .utils import (
-	get_query,
-	get_session
+    get_query,
+    get_session
 )
 
 __all__ = ['SQLAlchemyObjectType',

graphene_sqlalchemy/converter.py

@@ -1,11 +1,13 @@
 from singledispatch import singledispatch
 from sqlalchemy import types
-from sqlalchemy.orm import interfaces
 from sqlalchemy.dialects import postgresql
+from sqlalchemy.orm import interfaces
 
-from graphene import Enum, ID, Boolean, Float, Int, String, List, Field, Dynamic
+from graphene import (ID, Boolean, Dynamic, Enum, Field, Float, Int, List,
+                      String)
 from graphene.relay import is_node
 from graphene.types.json import JSONString
+
 from .fields import SQLAlchemyConnectionField
 
 try:

graphene_sqlalchemy/fields.py

@@ -1,9 +1,11 @@
 from functools import partial
+
 from sqlalchemy.orm.query import Query
 
 from graphene.relay import ConnectionField
 from graphene.relay.connection import PageInfo
 from graphql_relay.connection.arrayconnection import connection_from_list_slice
+
 from .utils import get_query
 
 

graphene_sqlalchemy/registry.py

@@ -1,12 +1,15 @@
 class Registry(object):
+
     def __init__(self):
         self._registry = {}
         self._registry_models = {}
         self._registry_composites = {}
 
     def register(self, cls):
         from .types import SQLAlchemyObjectType
-        assert issubclass(cls, SQLAlchemyObjectType), 'Only SQLAlchemyObjectType can be registered, received "{}"'.format(cls.__name__)
+        assert issubclass(
+            cls, SQLAlchemyObjectType), 'Only SQLAlchemyObjectType can be registered, received "{}"'.format(
+            cls.__name__)
         assert cls._meta.registry == self, 'Registry for a Model have to match.'
         # assert self.get_type_for_model(cls._meta.model) in [None, cls], (
         #     'SQLAlchemy model "{}" already associated with '

graphene_sqlalchemy/tests/test_converter.py

@@ -1,20 +1,20 @@
 from py.test import raises
 from sqlalchemy import Column, Table, types
-from sqlalchemy.orm import composite
+from sqlalchemy.dialects import postgresql
 from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import composite
 from sqlalchemy_utils import ChoiceType, ScalarListType
-from sqlalchemy.dialects import postgresql
 
 import graphene
 from graphene.relay import Node
 from graphene.types.json import JSONString
+
 from ..converter import (convert_sqlalchemy_column,
                          convert_sqlalchemy_composite,
                          convert_sqlalchemy_relationship)
 from ..fields import SQLAlchemyConnectionField
-from ..types import SQLAlchemyObjectType
 from ..registry import Registry
-
+from ..types import SQLAlchemyObjectType
 from .models import Article, Pet, Reporter
 
 
@@ -136,6 +136,7 @@ def test_should_manytomany_convert_connectionorlist():
 
 def test_should_manytomany_convert_connectionorlist_list():
     class A(SQLAlchemyObjectType):
+
         class Meta:
             model = Pet
 
@@ -149,6 +150,7 @@ class Meta:
 
 def test_should_manytomany_convert_connectionorlist_connection():
     class A(SQLAlchemyObjectType):
+
         class Meta:
             model = Pet
             interfaces = (Node, )
@@ -167,6 +169,7 @@ def test_should_manytoone_convert_connectionorlist():
 
 def test_should_manytoone_convert_connectionorlist_list():
     class A(SQLAlchemyObjectType):
+
         class Meta:
             model = Reporter
 
@@ -179,6 +182,7 @@ class Meta:
 
 def test_should_manytoone_convert_connectionorlist_connection():
     class A(SQLAlchemyObjectType):
+
         class Meta:
             model = Reporter
             interfaces = (Node, )
@@ -192,6 +196,7 @@ class Meta:
 
 def test_should_onetoone_convert_field():
     class A(SQLAlchemyObjectType):
+
         class Meta:
             model = Article
             interfaces = (Node, )
@@ -230,6 +235,7 @@ def test_should_postgresql_hstore_convert():
 def test_should_composite_convert():
 
     class CompositeClass(object):
+
         def __init__(self, col1, col2):
             self.col1 = col1
             self.col2 = col2
@@ -253,6 +259,7 @@ def test_should_unknown_sqlalchemy_composite_raise_exception():
     with raises(Exception) as excinfo:
 
         class CompositeClass(object):
+
             def __init__(self, col1, col2):
                 self.col1 = col1
                 self.col2 = col2

graphene_sqlalchemy/tests/test_query.py

@@ -4,9 +4,9 @@
 
 import graphene
 from graphene.relay import Node
-from ..types import SQLAlchemyObjectType
-from ..fields import SQLAlchemyConnectionField
 
+from ..fields import SQLAlchemyConnectionField
+from ..types import SQLAlchemyObjectType
 from .models import Article, Base, Editor, Reporter
 
 db = create_engine('sqlite:///test_sqlalchemy.sqlite3')
@@ -250,7 +250,6 @@ class Meta:
             model = Editor
             interfaces = (Node, )
 
-
     class ReporterNode(SQLAlchemyObjectType):
 
         class Meta:
@@ -268,6 +267,7 @@ class Meta:
             interfaces = (Node, )
 
     class CreateArticle(graphene.Mutation):
+
         class Input:
             headline = graphene.String()
             reporter_id = graphene.ID()
@@ -279,7 +279,7 @@ class Input:
         def mutate(cls, instance, args, context, info):
             new_article = Article(
                 headline=args.get('headline'),
-                reporter_id = args.get('reporter_id'),
+                reporter_id=args.get('reporter_id'),
             )
 
             session.add(new_article)

graphene_sqlalchemy/tests/test_schema.py

@@ -1,9 +1,8 @@
 from py.test import raises
 
+from ..registry import Registry
 from ..types import SQLAlchemyObjectType
-
 from .models import Reporter
-from ..registry import Registry
 
 
 def test_should_raise_if_no_model():
@@ -16,6 +15,7 @@ class Character1(SQLAlchemyObjectType):
 def test_should_raise_if_model_is_invalid():
     with raises(Exception) as excinfo:
         class Character2(SQLAlchemyObjectType):
+
             class Meta:
                 model = 1
     assert 'valid SQLAlchemy Model' in str(excinfo.value)
@@ -28,7 +28,15 @@ class Meta:
             model = Reporter
             registry = Registry()
 
-    assert list(ReporterType2._meta.fields.keys()) == ['id', 'first_name', 'last_name', 'email', 'pets', 'articles', 'favorite_article']
+    assert list(
+        ReporterType2._meta.fields.keys()) == [
+        'id',
+        'first_name',
+        'last_name',
+        'email',
+        'pets',
+        'articles',
+        'favorite_article']
 
 
 def test_should_map_only_few_fields():

graphene_sqlalchemy/tests/test_types.py

@@ -1,14 +1,9 @@
-from graphql.type import GraphQLObjectType, GraphQLInterfaceType
-from graphql import GraphQLInt
-from pytest import raises
 
-from graphene import Schema, Interface, ObjectType
+from graphene import Field, Int, Interface, ObjectType
 from graphene.relay import Node, is_node
-from ..types import SQLAlchemyObjectType
-from ..registry import Registry
-
-from graphene import Field, Int
 
+from ..registry import Registry
+from ..types import SQLAlchemyObjectType
 from .models import Article, Reporter
 
 registry = Registry()
@@ -48,7 +43,15 @@ def test_sqlalchemy_interface():
 def test_objecttype_registered():
     assert issubclass(Character, ObjectType)
     assert Character._meta.model == Reporter
-    assert list(Character._meta.fields.keys()) == ['id', 'first_name', 'last_name', 'email', 'pets', 'articles', 'favorite_article']
+    assert list(
+        Character._meta.fields.keys()) == [
+        'id',
+        'first_name',
+        'last_name',
+        'email',
+        'pets',
+        'articles',
+        'favorite_article']
 
 
 # def test_sqlalchemynode_idfield():

graphene_sqlalchemy/types.py

@@ -1,21 +1,21 @@
 from collections import OrderedDict
+
 import six
 from sqlalchemy.inspection import inspect as sqlalchemyinspect
 from sqlalchemy.orm.exc import NoResultFound
 
-from graphene import ObjectType, Field
+from graphene import Field, ObjectType
 from graphene.relay import is_node
+from graphene.types.objecttype import ObjectTypeMeta
+from graphene.types.options import Options
+from graphene.types.utils import merge, yank_fields_from_attrs
+from graphene.utils.is_base_type import is_base_type
+
 from .converter import (convert_sqlalchemy_column,
                         convert_sqlalchemy_composite,
                         convert_sqlalchemy_relationship)
-from .utils import is_mapped
-
-from graphene.types.objecttype import ObjectTypeMeta
-from graphene.types.options import Options
 from .registry import Registry, get_global_registry
-from graphene.utils.is_base_type import is_base_type
-from graphene.types.utils import yank_fields_from_attrs, merge
-from .utils import get_query
+from .utils import get_query, is_mapped
 
 
 def construct_fields(options):
@@ -96,7 +96,6 @@ def __new__(cls, name, bases, attrs):
             '{}.Meta, received "{}".'
         ).format(name, options.model)
 
-
         cls = ObjectTypeMeta.__new__(cls, name, bases, dict(attrs, _meta=options))
 
         options.registry.register(cls)
@@ -116,6 +115,7 @@ def __new__(cls, name, bases, attrs):
 
 
 class SQLAlchemyObjectType(six.with_metaclass(SQLAlchemyObjectTypeMeta, ObjectType)):
+
     @classmethod
     def is_type_of(cls, root, context, info):
         if isinstance(root, cls):
@@ -124,7 +124,7 @@ def is_type_of(cls, root, context, info):
             raise Exception((
                 'Received incompatible instance "{}".'
             ).format(root))
-        return type(root) == cls._meta.model
+        return isinstance(root, cls._meta.model)
 
     @classmethod
     def get_query(cls, context):
@@ -138,8 +138,8 @@ def get_node(cls, id, context, info):
         except NoResultFound:
             return None
 
-    def resolve_id(root, args, context, info):
+    def resolve_id(self, args, context, info):
         graphene_type = info.parent_type.graphene_type
         if is_node(graphene_type):
-            return root.__mapper__.primary_key_from_instance(root)[0]
-        return getattr(root, graphene_type._meta.id, None)
+            return self.__mapper__.primary_key_from_instance(self)[0]
+        return getattr(self, graphene_type._meta.id, None)