diff --git a/examples/starwars/data.py b/examples/starwars/data.py index 6c68b85c..c374b713 100644 --- a/examples/starwars/data.py +++ b/examples/starwars/data.py @@ -3,7 +3,7 @@ droid_data = {} 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 0ed654c2..ab3dc475 100644 --- a/examples/starwars_relay/data.py +++ b/examples/starwars_relay/data.py @@ -4,7 +4,7 @@ data = {} 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 7bce5ba3..7462e104 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 __future__ import unicode_literals 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 88212871..9b10a398 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 19530eff..df1ef82d 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/test/__init__.py b/graphene/test/__init__.py index 8591dc06..8da09550 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 71026d45..31a23db7 100644 --- a/graphene/types/argument.py +++ b/graphene/types/argument.py @@ -71,9 +71,9 @@ class Argument(MountedType): 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 baedabeb..1ec87743 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 908cc7c8..74aff1e7 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 dafb04b5..91d511bf 100644 --- a/graphene/types/field.py +++ b/graphene/types/field.py @@ -2,13 +2,13 @@ import inspect 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 5d1a6c4b..e75a58af 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 98f0148d..6eda6a7e 100644 --- a/graphene/types/inputobjecttype.py +++ b/graphene/types/inputobjecttype.py @@ -6,7 +6,7 @@ from .utils import yank_fields_from_attrs # 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 6e041bbf..18aa1f68 100644 --- a/graphene/types/mutation.py +++ b/graphene/types/mutation.py @@ -2,15 +2,16 @@ from ..utils.deprecated import warn_deprecation 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 f4a0f5a0..975b2393 100644 --- a/graphene/types/objecttype.py +++ b/graphene/types/objecttype.py @@ -4,9 +4,9 @@ from .interface import Interface 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 472f2d41..1658ec1c 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 55f0bf93..f8666be1 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 b096dcbc..d6f08882 100644 --- a/graphene/types/tests/test_base64.py +++ b/graphene/types/tests/test_base64.py @@ -2,10 +2,10 @@ import base64 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 74f88bd8..3eddefff 100644 --- a/graphene/types/tests/test_datetime.py +++ b/graphene/types/tests/test_datetime.py @@ -2,7 +2,6 @@ import datetime 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 4a7ad3c7..5564afab 100644 --- a/graphene/types/tests/test_mutation.py +++ b/graphene/types/tests/test_mutation.py @@ -2,12 +2,12 @@ from pytest import raises 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 2d3e4c73..14324d69 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 dcadb6d8..96d75a70 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 2ff67208..0e924fcb 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 9b7a1f13..b68f6875 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 334eb241..c0c30ede 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 ..inputobjecttype import InputObjectType 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 928656ae..44f1086f 100644 --- a/graphene/types/union.py +++ b/graphene/types/union.py @@ -4,9 +4,10 @@ from .unmountedtype import UnmountedType # 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 c21eb165..5e49ebfe 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 b845caf1..1c79dc30 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