Improved sorts and schema logic

Author: syrusakbary

graphql/execution/executor.py

@@ -13,7 +13,6 @@
                    get_operation_root_type)
 from .executors.sync import SyncExecutor
 
-
 logger = logging.getLogger(__name__)
 
 

graphql/type/directives.py

@@ -1,8 +1,8 @@
 import collections
 
+from ..utils.assert_valid_name import assert_valid_name
 from .definition import GraphQLArgument, GraphQLNonNull
 from .scalars import GraphQLBoolean
-from ..utils.assert_valid_name import assert_valid_name
 
 
 class DirectiveLocation(object):

graphql/type/introspection.py

@@ -7,9 +7,8 @@
                          GraphQLInterfaceType, GraphQLList, GraphQLNonNull,
                          GraphQLObjectType, GraphQLScalarType,
                          GraphQLUnionType)
-from .scalars import GraphQLBoolean, GraphQLString
 from .directives import DirectiveLocation
-
+from .scalars import GraphQLBoolean, GraphQLString
 
 __Schema = GraphQLObjectType(
     '__Schema',

graphql/type/schema.py

@@ -38,8 +38,6 @@ def __init__(self, query, mutation=None, subscription=None, directives=None):
         self._query = query
         self._mutation = mutation
         self._subscription = subscription
-        self._type_map = self._build_type_map()
-
         if directives is None:
             directives = [
                 GraphQLIncludeDirective,
@@ -52,7 +50,9 @@ def __init__(self, query, mutation=None, subscription=None, directives=None):
         )
 
         self._directives = directives
+        self._type_map = self._build_type_map()
 
+        # Enforce correct interface implementations.
         for type in self._type_map.values():
             if isinstance(type, GraphQLObjectType):
                 for interface in type.get_interfaces():

graphql/utils/assert_valid_name.py

@@ -1,6 +1,5 @@
 import re
 
-
 NAME_PATTERN = r'^[_a-zA-Z][_a-zA-Z0-9]*$'
 COMPILED_NAME_PATTERN = re.compile(NAME_PATTERN)
 

graphql/utils/build_client_schema.py

@@ -8,7 +8,7 @@
                     GraphQLNonNull, GraphQLObjectType, GraphQLScalarType,
                     GraphQLSchema, GraphQLString, GraphQLUnionType,
                     is_input_type, is_output_type)
-from ..type.directives import GraphQLDirective, DirectiveLocation
+from ..type.directives import DirectiveLocation, GraphQLDirective
 from ..type.introspection import TypeKind
 from .value_from_ast import value_from_ast