Review+isort

Signed-off-by: Erik Wrede <[email protected]>

Author: erikwrede

graphene_sqlalchemy/converter.py

@@ -17,9 +17,11 @@
 from .enums import enum_for_sa_enum
 from .fields import (BatchSQLAlchemyConnectionField,
                      default_connection_field_factory)
+from .registry import get_global_registry
 from .resolvers import get_attr_resolver, get_custom_resolver
-from .utils import (registry_sqlalchemy_model_from_str, safe_isinstance,
-                    singledispatchbymatchfunction, value_equals, DummyImport)
+from .utils import (DummyImport, registry_sqlalchemy_model_from_str,
+                    safe_isinstance, singledispatchbymatchfunction,
+                    value_equals)
 
 try:
     from typing import ForwardRef
@@ -248,7 +250,6 @@ def convert_column_to_float(type, column, registry=None):
 
 @convert_sqlalchemy_type.register(sqa_types.Enum)
 def convert_enum_to_enum(type, column, registry=None):
-    from .registry import get_global_registry
     return lambda: enum_for_sa_enum(type, registry or get_global_registry())
 
 
@@ -257,8 +258,6 @@ def convert_enum_to_enum(type, column, registry=None):
 def convert_choice_to_enum(type, column, registry=None):
     name = "{}_{}".format(column.table.name, column.key).upper()
     if isinstance(type.type_impl, EnumTypeImpl):
-        print("AAAA")
-        print(EnumTypeImpl)
         # type.choices may be Enum/IntEnum, in ChoiceType both presented as EnumMeta
         # do not use from_enum here because we can have more than one enum column in table
         return graphene.Enum(name, list((v.name, v.value) for v in type.choices))
@@ -302,7 +301,6 @@ def convert_variant_to_impl_type(type, column, registry=None):
 
 @singledispatchbymatchfunction
 def convert_sqlalchemy_hybrid_property_type(arg: Any):
-    from .registry import get_global_registry
     existing_graphql_type = get_global_registry().get_type_for_model(arg)
     if existing_graphql_type:
         return existing_graphql_type

graphene_sqlalchemy/tests/test_converter.py

@@ -3,16 +3,16 @@
 from typing import Dict, Union
 
 import pytest
+import sqlalchemy_utils as sqa_utils
 from sqlalchemy import Column, func, select, types
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.inspection import inspect
 from sqlalchemy.orm import column_property, composite
-import sqlalchemy_utils as sqa_utils
 
-from graphene.relay import Node
 import graphene
+from graphene.relay import Node
 from graphene.types.structures import Structure
 
 from ..converter import (convert_sqlalchemy_column,

graphene_sqlalchemy/tests/test_registry.py

@@ -1,8 +1,8 @@
 import pytest
 from sqlalchemy.types import Enum as SQLAlchemyEnum
 
-from graphene import Enum as GrapheneEnum
 import graphene
+from graphene import Enum as GrapheneEnum
 
 from ..registry import Registry
 from ..types import SQLAlchemyObjectType
@@ -147,7 +147,7 @@ class Meta:
     reg.register_union_type(union, union_types)
 
     assert reg.get_union_for_object_types(union_types) == union
-    # Order should no matter
+    # Order should not matter
     assert reg.get_union_for_object_types([ReporterType, PetType]) == union
 
 

graphene_sqlalchemy/tests/test_utils.py

@@ -3,8 +3,8 @@
 
 from graphene import Enum, List, ObjectType, Schema, String
 
-from ..utils import (get_session, sort_argument_for_model, sort_enum_for_model,
-                     to_enum_value_name, to_type_name, DummyImport)
+from ..utils import (DummyImport, get_session, sort_argument_for_model,
+                     sort_enum_for_model, to_enum_value_name, to_type_name)
 from .models import Base, Editor, Pet