Minimize diff further

Author: Daniel Gallagher

graphql/execution/tests/test_subscribe.py

@@ -1,9 +1,5 @@
 # type: ignore
 from collections import OrderedDict, namedtuple
-
-from graphql import (GraphQLBoolean, GraphQLField, GraphQLInt, GraphQLList,
-                     GraphQLObjectType, GraphQLSchema, GraphQLString, graphql,
-                     parse, subscribe)
 from rx import Observable, Observer
 from rx.subjects import Subject
 from graphql import (

graphql/execution/tests/test_variables.py

@@ -2,6 +2,7 @@
 import json
 from collections import OrderedDict
 
+from pytest import raises
 from graphql.error import GraphQLError, format_error
 from graphql.execution import execute
 from graphql.language.parser import parse
@@ -25,8 +26,6 @@
 # from typing import Dict
 # from typing import Union
 
-from pytest import raises
-
 TestComplexScalar = GraphQLScalarType(
     name="ComplexScalar",
     serialize=lambda v: "SerializedValue" if v == "DeserializedValue" else None,

graphql/graphql.py

@@ -1,8 +1,7 @@
-from promise import promisify
-
-from .backend import get_default_backend
 from .execution import ExecutionResult
+from .backend import get_default_backend
 
+from promise import promisify
 
 # Necessary for static type checking
 if False:  # flake8: noqa

graphql/language/tests/test_lexer.py

@@ -1,9 +1,9 @@
+from pytest import raises
+
 from graphql.error import GraphQLSyntaxError
 from graphql.language.lexer import Lexer, Token, TokenKind
 from graphql.language.source import Source
 
-from pytest import raises
-
 
 def lex_one(s):
     # type: (str) -> Token

graphql/language/tests/test_parser.py

@@ -1,11 +1,11 @@
+from pytest import raises
+
 from graphql.error import GraphQLSyntaxError
 from graphql.language import ast
 from graphql.language.location import SourceLocation
 from graphql.language.parser import Loc, parse
 from graphql.language.source import Source
 
-from pytest import raises
-
 from .fixtures import KITCHEN_SINK
 
 

graphql/language/tests/test_printer.py

@@ -1,11 +1,11 @@
 import copy
 
+from pytest import raises
+
 from graphql.language.ast import Field, Name
 from graphql.language.parser import parse
 from graphql.language.printer import print_ast
 
-from pytest import raises
-
 from .fixtures import KITCHEN_SINK
 
 

graphql/language/tests/test_schema_parser.py

@@ -1,11 +1,11 @@
+from pytest import raises
+
 from graphql import Source, parse
 from graphql.error import GraphQLSyntaxError
 from graphql.language import ast
 from graphql.language.parser import Loc
 from typing import Callable
 
-from pytest import raises
-
 
 def create_loc_fn(body):
     # type: (str) -> Callable

graphql/language/tests/test_schema_printer.py

@@ -1,5 +1,7 @@
 from copy import deepcopy
 
+from pytest import raises
+
 from graphql import parse
 from graphql.language import ast
 from graphql.language.printer import print_ast

graphql/pyutils/tests/test_default_ordered_dict.py

@@ -1,10 +1,10 @@
 import copy
 import pickle
 
-from graphql.pyutils.default_ordered_dict import DefaultOrderedDict
-
 from pytest import raises
 
+from graphql.pyutils.default_ordered_dict import DefaultOrderedDict
+
 
 def test_will_missing_will_set_value_from_factory():
     d = DefaultOrderedDict(list)

graphql/type/tests/test_serialization.py

@@ -2,8 +2,6 @@
 
 from graphql.type import GraphQLBoolean, GraphQLFloat, GraphQLInt, GraphQLString
 
-import pytest
-
 
 def test_serializes_output_int():
     assert GraphQLInt.serialize(1) == 1

graphql/type/tests/test_validation.py

@@ -19,8 +19,6 @@
 )
 from graphql.type.definition import GraphQLArgument
 
-from pytest import raises
-
 _none = lambda *args: None
 _true = lambda *args: True
 _false = lambda *args: False

graphql/utils/tests/test_build_ast_schema.py

@@ -1,7 +1,9 @@
+from pytest import raises
+
 from graphql import GraphQLInt, parse
 from graphql.utils.build_ast_schema import build_ast_schema
 from graphql.utils.schema_printer import print_schema
-from pytest import raises
+
 from ...type import (
     GraphQLDeprecatedDirective,
     GraphQLIncludeDirective,

graphql/utils/tests/test_build_client_schema.py

@@ -1,5 +1,7 @@
 from collections import OrderedDict
 
+from pytest import raises
+
 from graphql import graphql
 from graphql.error import format_error
 from graphql.type import (
@@ -26,8 +28,6 @@
 from graphql.utils.build_client_schema import build_client_schema
 from graphql.utils.introspection_query import introspection_query
 
-from pytest import raises
-
 from ...pyutils.contain_subset import contain_subset
 
 

graphql/utils/tests/test_extend_schema.py

@@ -1,5 +1,7 @@
 from collections import OrderedDict
 
+from pytest import raises
+
 from graphql import parse
 from graphql.execution import execute
 from graphql.type import (
@@ -19,8 +21,6 @@
 from graphql.utils.extend_schema import extend_schema
 from graphql.utils.schema_printer import print_schema
 
-from pytest import raises
-
 # Test schema.
 SomeInterfaceType = GraphQLInterfaceType(
     name="SomeInterface",