diff --git a/examples/starwars/data.py b/examples/starwars/data.py index 6c68b85c1..c374b7130 100644 --- a/examples/starwars/data.py +++ b/examples/starwars/data.py @@ -3,7 +3,7 @@ def setup(): - from .schema import Human, Droid + from .schema import Droid, Human global human_data, droid_data luke = Human( diff --git a/examples/starwars_relay/data.py b/examples/starwars_relay/data.py index 0ed654c2a..ab3dc475d 100644 --- a/examples/starwars_relay/data.py +++ b/examples/starwars_relay/data.py @@ -4,7 +4,7 @@ def setup(): global data - from .schema import Ship, Faction + from .schema import Faction, Ship xwing = Ship(id="1", name="X-Wing") diff --git a/examples/starwars_relay/tests/snapshots/snap_test_objectidentification.py b/examples/starwars_relay/tests/snapshots/snap_test_objectidentification.py index 7bce5ba33..7462e1041 100644 --- a/examples/starwars_relay/tests/snapshots/snap_test_objectidentification.py +++ b/examples/starwars_relay/tests/snapshots/snap_test_objectidentification.py @@ -4,7 +4,6 @@ from snapshottest import Snapshot - snapshots = Snapshot() snapshots["test_correctly_fetches_id_name_rebels 1"] = { diff --git a/graphene/__init__.py b/graphene/__init__.py index 882128713..9b10a3981 100644 --- a/graphene/__init__.py +++ b/graphene/__init__.py @@ -1,43 +1,11 @@ from .pyutils.version import get_version -from .relay import ( - ClientIDMutation, - Connection, - ConnectionField, - GlobalID, - Node, - PageInfo, - is_node, -) -from .types import ( - ID, - UUID, - Argument, - Base64, - Boolean, - Context, - Date, - DateTime, - Decimal, - Dynamic, - Enum, - Field, - Float, - InputField, - InputObjectType, - Int, - Interface, - JSONString, - List, - Mutation, - NonNull, - ObjectType, - ResolveInfo, - Scalar, - Schema, - String, - Time, - Union, -) +from .relay import (ClientIDMutation, Connection, ConnectionField, GlobalID, + Node, PageInfo, is_node) +from .types import (ID, UUID, Argument, Base64, Boolean, Context, Date, + DateTime, Decimal, Dynamic, Enum, Field, Float, InputField, + InputObjectType, Int, Interface, JSONString, List, + Mutation, NonNull, ObjectType, ResolveInfo, Scalar, Schema, + String, Time, Union) from .utils.module_loading import lazy_import from .utils.resolve_only_args import resolve_only_args diff --git a/graphene/pyutils/dataclasses.py b/graphene/pyutils/dataclasses.py index 19530eff1..df1ef82d9 100644 --- a/graphene/pyutils/dataclasses.py +++ b/graphene/pyutils/dataclasses.py @@ -2,12 +2,12 @@ # https://docs.python.org/3/library/dataclasses.html # Original PEP proposal: PEP 557 # https://www.python.org/dev/peps/pep-0557/ -import re -import sys import copy -import types import inspect import keyword +import re +import sys +import types __all__ = [ "dataclass", diff --git a/graphene/relay/__init__.py b/graphene/relay/__init__.py index 7238fa72e..313a6f247 100644 --- a/graphene/relay/__init__.py +++ b/graphene/relay/__init__.py @@ -1,6 +1,6 @@ -from .node import Node, is_node, GlobalID -from .mutation import ClientIDMutation from .connection import Connection, ConnectionField, PageInfo +from .mutation import ClientIDMutation +from .node import GlobalID, Node, is_node __all__ = [ "Node", diff --git a/graphene/relay/connection.py b/graphene/relay/connection.py index 1a4684e56..ddc1d406a 100644 --- a/graphene/relay/connection.py +++ b/graphene/relay/connection.py @@ -4,7 +4,8 @@ from graphql_relay import connection_from_array -from ..types import Boolean, Enum, Int, Interface, List, NonNull, Scalar, String, Union +from ..types import (Boolean, Enum, Int, Interface, List, NonNull, Scalar, + String, Union) from ..types.field import Field from ..types.objecttype import ObjectType, ObjectTypeOptions from ..utils.thenables import maybe_thenable diff --git a/graphene/relay/tests/test_connection.py b/graphene/relay/tests/test_connection.py index 4015f4b43..5320b21e0 100644 --- a/graphene/relay/tests/test_connection.py +++ b/graphene/relay/tests/test_connection.py @@ -1,6 +1,7 @@ from pytest import raises -from ...types import Argument, Field, Int, List, NonNull, ObjectType, Schema, String +from ...types import (Argument, Field, Int, List, NonNull, ObjectType, Schema, + String) from ..connection import Connection, ConnectionField, PageInfo from ..node import Node diff --git a/graphene/relay/tests/test_connection_async.py b/graphene/relay/tests/test_connection_async.py index b139f6a39..dade1f3c0 100644 --- a/graphene/relay/tests/test_connection_async.py +++ b/graphene/relay/tests/test_connection_async.py @@ -1,10 +1,9 @@ -from pytest import mark - from graphql_relay.utils import base64 +from pytest import mark -from graphene.types import ObjectType, Schema, String from graphene.relay.connection import Connection, ConnectionField, PageInfo from graphene.relay.node import Node +from graphene.types import ObjectType, Schema, String letter_chars = ["A", "B", "C", "D", "E"] diff --git a/graphene/relay/tests/test_connection_query.py b/graphene/relay/tests/test_connection_query.py index cac4b65b0..d9453bf1d 100644 --- a/graphene/relay/tests/test_connection_query.py +++ b/graphene/relay/tests/test_connection_query.py @@ -1,6 +1,5 @@ -from pytest import mark - from graphql_relay.utils import base64 +from pytest import mark from ...types import ObjectType, Schema, String from ..connection import Connection, ConnectionField, PageInfo diff --git a/graphene/relay/tests/test_mutation.py b/graphene/relay/tests/test_mutation.py index e079ab4ea..9afd6817e 100644 --- a/graphene/relay/tests/test_mutation.py +++ b/graphene/relay/tests/test_mutation.py @@ -1,15 +1,7 @@ from pytest import mark, raises -from ...types import ( - ID, - Argument, - Field, - InputField, - InputObjectType, - NonNull, - ObjectType, - Schema, -) +from ...types import (ID, Argument, Field, InputField, InputObjectType, + NonNull, ObjectType, Schema) from ...types.scalars import String from ..mutation import ClientIDMutation diff --git a/graphene/relay/tests/test_mutation_async.py b/graphene/relay/tests/test_mutation_async.py index 4308a6141..99646623d 100644 --- a/graphene/relay/tests/test_mutation_async.py +++ b/graphene/relay/tests/test_mutation_async.py @@ -1,8 +1,8 @@ from pytest import mark +from graphene.relay.mutation import ClientIDMutation from graphene.types import ID, Field, ObjectType, Schema from graphene.types.scalars import String -from graphene.relay.mutation import ClientIDMutation class SharedFields(object): diff --git a/graphene/relay/tests/test_node.py b/graphene/relay/tests/test_node.py index d46838acd..b3a6bbee2 100644 --- a/graphene/relay/tests/test_node.py +++ b/graphene/relay/tests/test_node.py @@ -1,4 +1,5 @@ import re + from graphql_relay import to_global_id from graphene.tests.utils import dedent diff --git a/graphene/test/__init__.py b/graphene/test/__init__.py index 8591dc066..8da09550f 100644 --- a/graphene/test/__init__.py +++ b/graphene/test/__init__.py @@ -1,6 +1,6 @@ -from promise import Promise, is_thenable -from graphql.error import format_error as format_graphql_error from graphql.error import GraphQLError +from graphql.error import format_error as format_graphql_error +from promise import Promise, is_thenable from graphene.types.schema import Schema diff --git a/graphene/types/argument.py b/graphene/types/argument.py index 71026d45b..31a23db72 100644 --- a/graphene/types/argument.py +++ b/graphene/types/argument.py @@ -71,9 +71,9 @@ def __eq__(self, other): def to_arguments(args, extra_args=None): - from .unmountedtype import UnmountedType from .field import Field from .inputfield import InputField + from .unmountedtype import UnmountedType if extra_args: extra_args = sorted(extra_args.items(), key=lambda f: f[1]) diff --git a/graphene/types/base64.py b/graphene/types/base64.py index baedabebe..1ec877432 100644 --- a/graphene/types/base64.py +++ b/graphene/types/base64.py @@ -1,5 +1,5 @@ -from binascii import Error as _Error from base64 import b64decode, b64encode +from binascii import Error as _Error from graphql.error import GraphQLError from graphql.language import StringValueNode, print_ast diff --git a/graphene/types/definitions.py b/graphene/types/definitions.py index 908cc7c86..74aff1e76 100644 --- a/graphene/types/definitions.py +++ b/graphene/types/definitions.py @@ -1,14 +1,8 @@ from enum import Enum as PyEnum -from graphql import ( - GraphQLEnumType, - GraphQLInputObjectType, - GraphQLInterfaceType, - GraphQLObjectType, - GraphQLScalarType, - GraphQLUnionType, - Undefined, -) +from graphql import (GraphQLEnumType, GraphQLInputObjectType, + GraphQLInterfaceType, GraphQLObjectType, + GraphQLScalarType, GraphQLUnionType, Undefined) class GrapheneGraphQLType: diff --git a/graphene/types/field.py b/graphene/types/field.py index dafb04b53..91d511bf9 100644 --- a/graphene/types/field.py +++ b/graphene/types/field.py @@ -2,13 +2,13 @@ from collections.abc import Mapping from functools import partial +from ..utils.deprecated import warn_deprecation from .argument import Argument, to_arguments from .mountedtype import MountedType from .resolver import default_resolver from .structures import NonNull from .unmountedtype import UnmountedType from .utils import get_type -from ..utils.deprecated import warn_deprecation base_type = type diff --git a/graphene/types/generic.py b/graphene/types/generic.py index 5d1a6c4b6..e75a58af4 100644 --- a/graphene/types/generic.py +++ b/graphene/types/generic.py @@ -1,13 +1,8 @@ from __future__ import unicode_literals -from graphql.language.ast import ( - BooleanValueNode, - FloatValueNode, - IntValueNode, - ListValueNode, - ObjectValueNode, - StringValueNode, -) +from graphql.language.ast import (BooleanValueNode, FloatValueNode, + IntValueNode, ListValueNode, ObjectValueNode, + StringValueNode) from graphene.types.scalars import MAX_INT, MIN_INT diff --git a/graphene/types/inputobjecttype.py b/graphene/types/inputobjecttype.py index 98f0148de..6eda6a7eb 100644 --- a/graphene/types/inputobjecttype.py +++ b/graphene/types/inputobjecttype.py @@ -6,7 +6,7 @@ # For static type checking with Mypy MYPY = False if MYPY: - from typing import Dict, Callable # NOQA + from typing import Callable, Dict # NOQA class InputObjectTypeOptions(BaseOptions): diff --git a/graphene/types/mutation.py b/graphene/types/mutation.py index 6e041bbfa..18aa1f68b 100644 --- a/graphene/types/mutation.py +++ b/graphene/types/mutation.py @@ -2,15 +2,16 @@ from ..utils.get_unbound_function import get_unbound_function from ..utils.props import props from .field import Field +from .interface import Interface from .objecttype import ObjectType, ObjectTypeOptions from .utils import yank_fields_from_attrs -from .interface import Interface # For static type checking with Mypy MYPY = False if MYPY: + from typing import Callable, Dict, Iterable, Type # NOQA + from .argument import Argument # NOQA - from typing import Dict, Type, Callable, Iterable # NOQA class MutationOptions(ObjectTypeOptions): diff --git a/graphene/types/objecttype.py b/graphene/types/objecttype.py index f4a0f5a0e..975b23930 100644 --- a/graphene/types/objecttype.py +++ b/graphene/types/objecttype.py @@ -4,9 +4,9 @@ from .utils import yank_fields_from_attrs try: - from dataclasses import make_dataclass, field + from dataclasses import field, make_dataclass except ImportError: - from ..pyutils.dataclasses import make_dataclass, field # type: ignore + from ..pyutils.dataclasses import field, make_dataclass # type: ignore # For static type checking with Mypy MYPY = False diff --git a/graphene/types/scalars.py b/graphene/types/scalars.py index 472f2d41e..1658ec1c3 100644 --- a/graphene/types/scalars.py +++ b/graphene/types/scalars.py @@ -1,11 +1,7 @@ from typing import Any -from graphql.language.ast import ( - BooleanValueNode, - FloatValueNode, - IntValueNode, - StringValueNode, -) +from graphql.language.ast import (BooleanValueNode, FloatValueNode, + IntValueNode, StringValueNode) from .base import BaseOptions, BaseType from .unmountedtype import UnmountedType diff --git a/graphene/types/schema.py b/graphene/types/schema.py index 55f0bf93b..f8666be18 100644 --- a/graphene/types/schema.py +++ b/graphene/types/schema.py @@ -1,45 +1,21 @@ import inspect from functools import partial -from graphql import ( - default_type_resolver, - get_introspection_query, - graphql, - graphql_sync, - introspection_types, - parse, - print_schema, - subscribe, - validate, - ExecutionResult, - GraphQLArgument, - GraphQLBoolean, - GraphQLError, - GraphQLEnumValue, - GraphQLField, - GraphQLFloat, - GraphQLID, - GraphQLInputField, - GraphQLInt, - GraphQLList, - GraphQLNonNull, - GraphQLObjectType, - GraphQLSchema, - GraphQLString, - Undefined, -) +from graphql import (ExecutionResult, GraphQLArgument, GraphQLBoolean, + GraphQLEnumValue, GraphQLError, GraphQLField, + GraphQLFloat, GraphQLID, GraphQLInputField, GraphQLInt, + GraphQLList, GraphQLNonNull, GraphQLObjectType, + GraphQLSchema, GraphQLString, Undefined, + default_type_resolver, get_introspection_query, graphql, + graphql_sync, introspection_types, parse, print_schema, + subscribe, validate) -from ..utils.str_converters import to_camel_case from ..utils.get_unbound_function import get_unbound_function -from .definitions import ( - GrapheneEnumType, - GrapheneGraphQLType, - GrapheneInputObjectType, - GrapheneInterfaceType, - GrapheneObjectType, - GrapheneScalarType, - GrapheneUnionType, -) +from ..utils.str_converters import to_camel_case +from .definitions import (GrapheneEnumType, GrapheneGraphQLType, + GrapheneInputObjectType, GrapheneInterfaceType, + GrapheneObjectType, GrapheneScalarType, + GrapheneUnionType) from .dynamic import Dynamic from .enum import Enum from .field import Field diff --git a/graphene/types/tests/test_base64.py b/graphene/types/tests/test_base64.py index b096dcbc8..d6f088820 100644 --- a/graphene/types/tests/test_base64.py +++ b/graphene/types/tests/test_base64.py @@ -2,10 +2,10 @@ from graphql import GraphQLError +from ..base64 import Base64 from ..objecttype import ObjectType from ..scalars import String from ..schema import Schema -from ..base64 import Base64 class Query(ObjectType): diff --git a/graphene/types/tests/test_datetime.py b/graphene/types/tests/test_datetime.py index 74f88bd88..3eddefffc 100644 --- a/graphene/types/tests/test_datetime.py +++ b/graphene/types/tests/test_datetime.py @@ -2,7 +2,6 @@ import pytz from graphql import GraphQLError - from pytest import fixture from ..datetime import Date, DateTime, Time diff --git a/graphene/types/tests/test_mutation.py b/graphene/types/tests/test_mutation.py index 4a7ad3c7c..5564afab6 100644 --- a/graphene/types/tests/test_mutation.py +++ b/graphene/types/tests/test_mutation.py @@ -2,12 +2,12 @@ from ..argument import Argument from ..dynamic import Dynamic +from ..interface import Interface from ..mutation import Mutation from ..objecttype import ObjectType from ..scalars import String from ..schema import Schema from ..structures import NonNull -from ..interface import Interface class MyType(Interface): diff --git a/graphene/types/tests/test_query.py b/graphene/types/tests/test_query.py index 2d3e4c730..14324d69c 100644 --- a/graphene/types/tests/test_query.py +++ b/graphene/types/tests/test_query.py @@ -1,13 +1,9 @@ import json from functools import partial -from graphql import ( - GraphQLError, - GraphQLResolveInfo as ResolveInfo, - Source, - execute, - parse, -) +from graphql import GraphQLError +from graphql import GraphQLResolveInfo as ResolveInfo +from graphql import Source, execute, parse from ..context import Context from ..dynamic import Dynamic diff --git a/graphene/types/tests/test_resolver.py b/graphene/types/tests/test_resolver.py index dcadb6d8d..96d75a701 100644 --- a/graphene/types/tests/test_resolver.py +++ b/graphene/types/tests/test_resolver.py @@ -1,10 +1,5 @@ -from ..resolver import ( - attr_resolver, - dict_resolver, - dict_or_attr_resolver, - get_default_resolver, - set_default_resolver, -) +from ..resolver import (attr_resolver, dict_or_attr_resolver, dict_resolver, + get_default_resolver, set_default_resolver) args = {} context = None diff --git a/graphene/types/tests/test_scalar.py b/graphene/types/tests/test_scalar.py index 2ff672082..0e924fcbb 100644 --- a/graphene/types/tests/test_scalar.py +++ b/graphene/types/tests/test_scalar.py @@ -1,6 +1,7 @@ -from ..scalars import Scalar, Int, BigInt from graphql.language.ast import IntValueNode +from ..scalars import BigInt, Int, Scalar + def test_scalar(): class JSONScalar(Scalar): diff --git a/graphene/types/tests/test_subscribe_async.py b/graphene/types/tests/test_subscribe_async.py index 9b7a1f13b..b68f68752 100644 --- a/graphene/types/tests/test_subscribe_async.py +++ b/graphene/types/tests/test_subscribe_async.py @@ -1,6 +1,6 @@ from pytest import mark -from graphene import ObjectType, Int, String, Schema, Field +from graphene import Field, Int, ObjectType, Schema, String class Query(ObjectType): diff --git a/graphene/types/tests/test_type_map.py b/graphene/types/tests/test_type_map.py index 334eb2415..c0c30ede8 100644 --- a/graphene/types/tests/test_type_map.py +++ b/graphene/types/tests/test_type_map.py @@ -1,14 +1,7 @@ -from graphql.type import ( - GraphQLArgument, - GraphQLEnumType, - GraphQLEnumValue, - GraphQLField, - GraphQLInputField, - GraphQLInputObjectType, - GraphQLInterfaceType, - GraphQLObjectType, - GraphQLString, -) +from graphql.type import (GraphQLArgument, GraphQLEnumType, GraphQLEnumValue, + GraphQLField, GraphQLInputField, + GraphQLInputObjectType, GraphQLInterfaceType, + GraphQLObjectType, GraphQLString) from ..dynamic import Dynamic from ..enum import Enum @@ -18,8 +11,8 @@ from ..interface import Interface from ..objecttype import ObjectType from ..scalars import Int, String -from ..structures import List, NonNull from ..schema import Schema +from ..structures import List, NonNull def create_type_map(types, auto_camelcase=True): diff --git a/graphene/types/union.py b/graphene/types/union.py index 928656ae8..44f1086ff 100644 --- a/graphene/types/union.py +++ b/graphene/types/union.py @@ -4,9 +4,10 @@ # For static type checking with Mypy MYPY = False if MYPY: - from .objecttype import ObjectType # NOQA from typing import Iterable, Type # NOQA + from .objecttype import ObjectType # NOQA + class UnionOptions(BaseOptions): types = () # type: Iterable[Type[ObjectType]] diff --git a/graphene/types/uuid.py b/graphene/types/uuid.py index c21eb1658..5e49ebfe3 100644 --- a/graphene/types/uuid.py +++ b/graphene/types/uuid.py @@ -1,4 +1,5 @@ from __future__ import absolute_import + from uuid import UUID as _UUID from graphql.language.ast import StringValueNode diff --git a/graphene/utils/tests/test_deduplicator.py b/graphene/utils/tests/test_deduplicator.py index b845caf19..1c79dc301 100644 --- a/graphene/utils/tests/test_deduplicator.py +++ b/graphene/utils/tests/test_deduplicator.py @@ -1,4 +1,5 @@ import datetime + import graphene from graphene import relay from graphene.types.resolver import dict_resolver