Way to 0.4.13

bin/autolinter

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Install the required scripts with
+# pip install autoflake autopep8 isort
+autoflake ./graphql/ ./tests/ -r --remove-unused-variables --in-place
+autopep8 ./tests/ ./graphql/ -r --in-place --experimental --aggressive --max-line-length 120
+isort -rc ./tests/ ./graphql/

graphql/core/execution/base.py

@@ -2,19 +2,10 @@
 from ..error import GraphQLError
 from ..language import ast
 from ..pyutils.defer import DeferredException
-from ..type.definition import (
-    GraphQLInterfaceType,
-    GraphQLUnionType,
-)
-from ..type.directives import (
-    GraphQLIncludeDirective,
-    GraphQLSkipDirective,
-)
-from ..type.introspection import (
-    SchemaMetaFieldDef,
-    TypeMetaFieldDef,
-    TypeNameMetaFieldDef,
-)
+from ..type.definition import GraphQLInterfaceType, GraphQLUnionType
+from ..type.directives import GraphQLIncludeDirective, GraphQLSkipDirective
+from ..type.introspection import (SchemaMetaFieldDef, TypeMetaFieldDef,
+                                  TypeNameMetaFieldDef)
 from ..utils.type_from_ast import type_from_ast
 from .values import get_argument_values, get_variable_values
 
@@ -97,7 +88,7 @@ def __init__(self, data=None, errors=None, invalid=False):
             errors = [
                 error.value if isinstance(error, DeferredException) else error
                 for error in errors
-                ]
+            ]
 
         self.errors = errors
 
@@ -170,7 +161,9 @@ def collect_fields(ctx, runtime_type, selection_set, fields, prev_fragment_names
             fields[name].append(selection)
 
         elif isinstance(selection, ast.InlineFragment):
-            if not should_include_node(ctx, directives) or not does_fragment_condition_match(ctx, selection, runtime_type):
+            if not should_include_node(
+                    ctx, directives) or not does_fragment_condition_match(
+                    ctx, selection, runtime_type):
                 continue
 
             collect_fields(ctx, runtime_type, selection.selection_set, fields, prev_fragment_names)
@@ -255,6 +248,7 @@ def get_field_entry_key(node):
 
 
 class ResolveInfo(object):
+
     def __init__(self, field_name, field_asts, return_type, parent_type, context):
         self.field_name = field_name
         self.field_asts = field_asts

graphql/core/execution/executor.py

@@ -6,15 +6,19 @@
 from ..language.parser import parse
 from ..language.source import Source
 from ..pyutils.default_ordered_dict import DefaultOrderedDict
-from ..pyutils.defer import Deferred, DeferredDict, DeferredList, defer, succeed
-from ..type import GraphQLEnumType, GraphQLInterfaceType, GraphQLList, GraphQLNonNull, GraphQLObjectType, \
-    GraphQLScalarType, GraphQLUnionType
+from ..pyutils.defer import (Deferred, DeferredDict, DeferredList, defer,
+                             succeed)
+from ..type import (GraphQLEnumType, GraphQLInterfaceType, GraphQLList,
+                    GraphQLNonNull, GraphQLObjectType, GraphQLScalarType,
+                    GraphQLUnionType)
 from ..validation import validate
-from .base import ExecutionContext, ExecutionResult, ResolveInfo, Undefined, collect_fields, default_resolve_fn, \
-    get_field_def, get_operation_root_type
+from .base import (ExecutionContext, ExecutionResult, ResolveInfo, Undefined,
+                   collect_fields, default_resolve_fn, get_field_def,
+                   get_operation_root_type)
 
 
 class Executor(object):
+
     def __init__(self, execution_middlewares=None, default_resolver=default_resolve_fn, map_type=dict):
         assert issubclass(map_type, collections.MutableMapping)
 

graphql/core/execution/middlewares/asyncio.py

@@ -17,6 +17,7 @@ def handle_future_result(future):
 
 
 class AsyncioExecutionMiddleware(object):
+
     @staticmethod
     def run_resolve_fn(resolver, original_resolver):
         result = resolver()

graphql/core/execution/middlewares/gevent.py

@@ -30,6 +30,7 @@ def resolve_something(context, _*):
 
 
 class GeventExecutionMiddleware(object):
+
     @staticmethod
     def run_resolve_fn(resolver, original_resolver):
         if resolver_has_tag(original_resolver, 'run_in_greenlet'):

graphql/core/execution/middlewares/sync.py

@@ -3,6 +3,7 @@
 
 
 class SynchronousExecutionMiddleware(object):
+
     @staticmethod
     def run_resolve_fn(resolver, original_resolver):
         result = resolver()

graphql/core/execution/values.py

@@ -1,16 +1,12 @@
 import collections
 import json
+
 from six import string_types
+
 from ..error import GraphQLError
 from ..language.printer import print_ast
-from ..type import (
-    GraphQLEnumType,
-    GraphQLInputObjectType,
-    GraphQLList,
-    GraphQLNonNull,
-    GraphQLScalarType,
-    is_input_type
-)
+from ..type import (GraphQLEnumType, GraphQLInputObjectType, GraphQLList,
+                    GraphQLNonNull, GraphQLScalarType, is_input_type)
 from ..utils.is_valid_value import is_valid_value
 from ..utils.type_from_ast import type_from_ast
 from ..utils.value_from_ast import value_from_ast

graphql/core/language/error.py

@@ -5,6 +5,7 @@
 
 
 class LanguageError(GraphQLError):
+
     def __init__(self, source, position, description):
         location = get_location(source, position)
         super(LanguageError, self).__init__(

graphql/core/language/lexer.py

@@ -1,5 +1,7 @@
 import json
+
 from six import unichr
+
 from .error import LanguageError
 
 __all__ = ['Token', 'Lexer', 'TokenKind',

graphql/core/language/parser.py

@@ -1,4 +1,5 @@
 from six import string_types
+
 from . import ast
 from .error import LanguageError
 from .lexer import Lexer, TokenKind, get_token_desc, get_token_kind_desc

graphql/core/language/printer.py

@@ -1,4 +1,5 @@
 import json
+
 from .visitor import Visitor, visit
 
 __all__ = ['print_ast']

graphql/core/language/visitor.py

@@ -1,10 +1,10 @@
 from copy import copy
 
 import six
+
 from . import ast
 from .visitor_meta import QUERY_DOCUMENT_KEYS, VisitorMeta
 
-
 BREAK = object()
 REMOVE = object()
 

graphql/core/language/visitor_meta.py

@@ -46,6 +46,7 @@
 
 
 class VisitorMeta(type):
+
     def __new__(cls, name, bases, attrs):
         enter_handlers = {}
         leave_handlers = {}

graphql/core/pyutils/defer.py

@@ -61,6 +61,7 @@
 # THE SOFTWARE.
 import collections
 import sys
+
 from six import reraise
 
 __all__ = ("Deferred", "AlreadyCalledDeferred", "DeferredException",
@@ -511,6 +512,7 @@ def _cb_deferred(self, result, key, succeeded):
 
 
 class DeferredDict(_ResultCollector):
+
     def __init__(self, mapping):
         super(DeferredDict, self).__init__()
         assert isinstance(mapping, collections.Mapping)
@@ -519,6 +521,7 @@ def __init__(self, mapping):
 
 
 class DeferredList(_ResultCollector):
+
     def __init__(self, sequence):
         super(DeferredList, self).__init__()
         assert isinstance(sequence, collections.Sequence)

graphql/core/type/definition.py

@@ -1,6 +1,7 @@
 import collections
 import copy
 import re
+
 from ..language import ast
 
 
@@ -466,7 +467,8 @@ def define_types(union_type, types):
     if callable(types):
         types = types()
 
-    assert isinstance(types, (list, tuple)) and len(types) > 0, 'Must provide types for Union {}.'.format(union_type.name)
+    assert isinstance(types, (list, tuple)) and len(
+        types) > 0, 'Must provide types for Union {}.'.format(union_type.name)
     has_resolve_type_fn = callable(union_type._resolve_type)
 
     for type in types:

graphql/core/type/introspection.py

@@ -1,19 +1,12 @@
 from collections import OrderedDict
+
 from ..language.printer import print_ast
 from ..utils.ast_from_value import ast_from_value
-from .definition import (
-    GraphQLArgument,
-    GraphQLEnumType,
-    GraphQLEnumValue,
-    GraphQLField,
-    GraphQLInputObjectType,
-    GraphQLInterfaceType,
-    GraphQLList,
-    GraphQLNonNull,
-    GraphQLObjectType,
-    GraphQLScalarType,
-    GraphQLUnionType,
-)
+from .definition import (GraphQLArgument, GraphQLEnumType, GraphQLEnumValue,
+                         GraphQLField, GraphQLInputObjectType,
+                         GraphQLInterfaceType, GraphQLList, GraphQLNonNull,
+                         GraphQLObjectType, GraphQLScalarType,
+                         GraphQLUnionType)
 from .scalars import GraphQLBoolean, GraphQLString
 
 __Schema = GraphQLObjectType(

graphql/core/type/scalars.py

@@ -1,10 +1,6 @@
 from six import text_type
-from ..language.ast import (
-    BooleanValue,
-    FloatValue,
-    IntValue,
-    StringValue,
-)
+
+from ..language.ast import BooleanValue, FloatValue, IntValue, StringValue
 from .definition import GraphQLScalarType
 
 # Integers are only safe when between -(2^53 - 1) and 2^53 - 1 due to being

graphql/core/type/schema.py

@@ -1,13 +1,11 @@
 from collections import OrderedDict
-from .definition import (
-    GraphQLInputObjectType,
-    GraphQLInterfaceType,
-    GraphQLList,
-    GraphQLNonNull,
-    GraphQLObjectType,
-    GraphQLUnionType,
-)
-from .directives import GraphQLDirective, GraphQLIncludeDirective, GraphQLSkipDirective
+
+from ..utils.type_comparators import is_equal_type, is_type_sub_type_of
+from .definition import (GraphQLInputObjectType, GraphQLInterfaceType,
+                         GraphQLList, GraphQLNonNull, GraphQLObjectType,
+                         GraphQLUnionType)
+from .directives import (GraphQLDirective, GraphQLIncludeDirective,
+                         GraphQLSkipDirective)
 from .introspection import IntrospectionSchema
 
 
@@ -50,7 +48,7 @@ def __init__(self, query, mutation=None, subscription=None, directives=None):
         assert all(isinstance(d, GraphQLDirective) for d in directives), \
             'Schema directives must be List[GraphQLDirective] if provided but got: {}.'.format(
                 directives
-            )
+        )
 
         self._directives = directives
 
@@ -144,7 +142,7 @@ def assert_object_implements_interface(object, interface):
             interface, field_name, object
         )
 
-        assert is_equal_type(interface_field.type, object_field.type), (
+        assert is_type_sub_type_of(object_field.type, interface_field.type), (
             '{}.{} expects type "{}" but {}.{} provides type "{}".'
         ).format(interface, field_name, interface_field.type, object, field_name, object_field.type)
 
@@ -171,13 +169,3 @@ def assert_object_implements_interface(object, interface):
                     '"{}" but is not also provided by the '
                     'interface {}.{}.'
                 ).format(object, field_name, arg_name, object_arg.type, interface, field_name)
-
-
-def is_equal_type(type_a, type_b):
-    if isinstance(type_a, GraphQLNonNull) and isinstance(type_b, GraphQLNonNull):
-        return is_equal_type(type_a.of_type, type_b.of_type)
-
-    if isinstance(type_a, GraphQLList) and isinstance(type_b, GraphQLList):
-        return is_equal_type(type_a.of_type, type_b.of_type)
-
-    return type_a is type_b

graphql/core/utils/ast_from_value.py

@@ -3,13 +3,10 @@
 import sys
 
 from six import string_types
+
 from ..language import ast
-from ..type.definition import (
-    GraphQLEnumType,
-    GraphQLInputObjectType,
-    GraphQLList,
-    GraphQLNonNull,
-)
+from ..type.definition import (GraphQLEnumType, GraphQLInputObjectType,
+                               GraphQLList, GraphQLNonNull)
 from ..type.scalars import GraphQLFloat
 
 

graphql/core/utils/ast_to_code.py

@@ -7,7 +7,9 @@ def ast_to_code(ast, indent=0):
     Converts an ast into a python code representation of the AST.
     """
     code = []
-    append = lambda line: code.append(('    ' * indent) + line)
+
+    def append(line):
+        code.append(('    ' * indent) + line)
 
     if isinstance(ast, Node):
         append('ast.{}('.format(ast.__class__.__name__))

graphql/core/utils/build_ast_schema.py

@@ -1,26 +1,12 @@
 from collections import OrderedDict
 
 from ..language import ast
-from ..type import (
-    GraphQLArgument,
-    GraphQLBoolean,
-    GraphQLEnumType,
-    GraphQLEnumValue,
-    GraphQLField,
-    GraphQLFloat,
-    GraphQLID,
-    GraphQLInputObjectField,
-    GraphQLInputObjectType,
-    GraphQLInt,
-    GraphQLInterfaceType,
-    GraphQLList,
-    GraphQLNonNull,
-    GraphQLObjectType,
-    GraphQLScalarType,
-    GraphQLSchema,
-    GraphQLString,
-    GraphQLUnionType,
-)
+from ..type import (GraphQLArgument, GraphQLBoolean, GraphQLEnumType,
+                    GraphQLEnumValue, GraphQLField, GraphQLFloat, GraphQLID,
+                    GraphQLInputObjectField, GraphQLInputObjectType,
+                    GraphQLInt, GraphQLInterfaceType, GraphQLList,
+                    GraphQLNonNull, GraphQLObjectType, GraphQLScalarType,
+                    GraphQLSchema, GraphQLString, GraphQLUnionType)
 from ..utils.value_from_ast import value_from_ast
 
 
@@ -41,8 +27,10 @@ def _get_inner_type_name(type_ast):
     return type_ast.name.value
 
 
-_false = lambda *_: False
-_none = lambda *_: None
+def _false(*_): return False
+
+
+def _none(*_): return None
 
 
 def build_ast_schema(document, query_type_name, mutation_type_name=None, subscription_type_name=None):