From d4418c9d02b51908c979df00e7c1919fdb364a29 Mon Sep 17 00:00:00 2001 From: Daniel Gallagher Date: Thu, 24 May 2018 22:40:21 -0700 Subject: [PATCH] Add reorder-python-imports pre-commit hook and run on all files --- .pre-commit-config.yaml | 4 ++ UPGRADE-v2.0.md | 10 +-- examples/starwars/schema.py | 6 +- examples/starwars/tests/test_query.py | 3 +- examples/starwars_relay/schema.py | 7 +- .../starwars_relay/tests/test_connections.py | 3 +- .../starwars_relay/tests/test_mutation.py | 3 +- .../tests/test_objectidentification.py | 3 +- graphene/__init__.py | 68 ++++++++++--------- graphene/pyutils/compat.py | 1 + graphene/pyutils/enum.py | 1 - graphene/pyutils/signature.py | 8 ++- graphene/pyutils/tests/test_enum.py | 3 +- graphene/relay/__init__.py | 8 ++- graphene/relay/connection.py | 20 ++++-- graphene/relay/mutation.py | 7 +- graphene/relay/node.py | 8 ++- graphene/relay/tests/test_connection.py | 13 +++- graphene/relay/tests/test_connection_query.py | 8 ++- graphene/relay/tests/test_global_id.py | 8 ++- graphene/relay/tests/test_mutation.py | 11 ++- graphene/relay/tests/test_node.py | 7 +- graphene/relay/tests/test_node_custom.py | 7 +- graphene/test/__init__.py | 3 +- graphene/tests/issues/test_313.py | 1 - graphene/tests/issues/test_356.py | 1 - graphene/tests/issues/test_425.py | 10 +-- graphene/tests/issues/test_490.py | 1 - graphene/types/__init__.py | 35 ++++++---- graphene/types/abstracttype.py | 2 +- graphene/types/datetime.py | 4 +- graphene/types/definitions.py | 9 ++- graphene/types/enum.py | 9 ++- graphene/types/field.py | 6 +- graphene/types/generic.py | 11 ++- graphene/types/inputobjecttype.py | 3 +- graphene/types/interface.py | 3 +- graphene/types/mutation.py | 5 +- graphene/types/objecttype.py | 3 +- graphene/types/scalars.py | 10 +-- graphene/types/schema.py | 13 ++-- graphene/types/tests/test_abstracttype.py | 6 +- graphene/types/tests/test_argument.py | 3 +- graphene/types/tests/test_base.py | 3 +- graphene/types/tests/test_datetime.py | 5 +- graphene/types/tests/test_definition.py | 9 +-- graphene/types/tests/test_dynamic.py | 3 +- graphene/types/tests/test_enum.py | 6 +- graphene/types/tests/test_inputobjecttype.py | 6 +- graphene/types/tests/test_json.py | 1 - graphene/types/tests/test_mountedtype.py | 1 - graphene/types/tests/test_objecttype.py | 4 +- graphene/types/tests/test_query.py | 15 ++-- graphene/types/tests/test_resolver.py | 7 +- graphene/types/tests/test_scalar.py | 1 - .../types/tests/test_scalars_serialization.py | 5 +- graphene/types/tests/test_structures.py | 3 +- graphene/types/tests/test_typemap.py | 23 ++++--- graphene/types/tests/test_uuid.py | 2 +- graphene/types/typemap.py | 34 +++++++--- graphene/types/union.py | 3 +- graphene/utils/annotate.py | 3 +- graphene/utils/resolve_only_args.py | 1 + graphene/utils/subclass_with_meta.py | 3 +- graphene/utils/tests/test_annotate.py | 1 + graphene/utils/tests/test_deprecated.py | 4 +- graphene/utils/tests/test_module_loading.py | 7 +- .../utils/tests/test_resolve_only_args.py | 2 +- graphene/utils/tests/test_str_converters.py | 4 +- setup.py | 8 ++- 70 files changed, 329 insertions(+), 190 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b6bb6ee3..17666168 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,3 +15,7 @@ - id: pretty-format-json args: - --autofix +- repo: git://github.com/asottile/reorder_python_imports + sha: v0.3.2 + hooks: + - id: reorder-python-imports diff --git a/UPGRADE-v2.0.md b/UPGRADE-v2.0.md index 96aac143..5dc76154 100644 --- a/UPGRADE-v2.0.md +++ b/UPGRADE-v2.0.md @@ -207,7 +207,7 @@ Before: ```python class SomeMutation(Mutation): ... - + @classmethod def mutate(cls, instance, args, context, info): ... @@ -218,7 +218,7 @@ With 2.0: ```python class SomeMutation(Mutation): ... - + def mutate(self, info, **args): ... ``` @@ -231,7 +231,7 @@ class SomeMutation(Mutation): first_name = String(required=True) last_name = String(required=True) ... - + def mutate(self, info, first_name, last_name): ... ``` @@ -250,7 +250,7 @@ If you are using Middelwares, you need to some adjustments: Before: ```python -class MyGrapheneMiddleware(object): +class MyGrapheneMiddleware(object): def resolve(self, next_mw, root, args, context, info): ## Middleware code @@ -261,7 +261,7 @@ class MyGrapheneMiddleware(object): With 2.0: ```python -class MyGrapheneMiddleware(object): +class MyGrapheneMiddleware(object): def resolve(self, next_mw, root, info, **args): context = info.context diff --git a/examples/starwars/schema.py b/examples/starwars/schema.py index a19a7b31..f19d67d3 100644 --- a/examples/starwars/schema.py +++ b/examples/starwars/schema.py @@ -1,6 +1,8 @@ import graphene - -from .data import get_character, get_droid, get_hero, get_human +from .data import get_character +from .data import get_droid +from .data import get_hero +from .data import get_human class Episode(graphene.Enum): diff --git a/examples/starwars/tests/test_query.py b/examples/starwars/tests/test_query.py index d88076a5..3b44b064 100644 --- a/examples/starwars/tests/test_query.py +++ b/examples/starwars/tests/test_query.py @@ -1,7 +1,6 @@ -from graphene.test import Client - from ..data import setup from ..schema import schema +from graphene.test import Client setup() diff --git a/examples/starwars_relay/schema.py b/examples/starwars_relay/schema.py index beb291c3..61c41f6a 100644 --- a/examples/starwars_relay/schema.py +++ b/examples/starwars_relay/schema.py @@ -1,8 +1,11 @@ import graphene +from .data import create_ship +from .data import get_empire +from .data import get_faction +from .data import get_rebels +from .data import get_ship from graphene import relay -from .data import create_ship, get_empire, get_faction, get_rebels, get_ship - class Ship(graphene.ObjectType): '''A ship in the Star Wars saga''' diff --git a/examples/starwars_relay/tests/test_connections.py b/examples/starwars_relay/tests/test_connections.py index bf26c0ec..7004966d 100644 --- a/examples/starwars_relay/tests/test_connections.py +++ b/examples/starwars_relay/tests/test_connections.py @@ -1,7 +1,6 @@ -from graphene.test import Client - from ..data import setup from ..schema import schema +from graphene.test import Client setup() diff --git a/examples/starwars_relay/tests/test_mutation.py b/examples/starwars_relay/tests/test_mutation.py index fb4ab7ad..bf5a98fb 100644 --- a/examples/starwars_relay/tests/test_mutation.py +++ b/examples/starwars_relay/tests/test_mutation.py @@ -1,7 +1,6 @@ -from graphene.test import Client - from ..data import setup from ..schema import schema +from graphene.test import Client setup() diff --git a/examples/starwars_relay/tests/test_objectidentification.py b/examples/starwars_relay/tests/test_objectidentification.py index 28a5decb..5b517171 100644 --- a/examples/starwars_relay/tests/test_objectidentification.py +++ b/examples/starwars_relay/tests/test_objectidentification.py @@ -1,7 +1,6 @@ -from graphene.test import Client - from ..data import setup from ..schema import schema +from graphene.test import Client setup() diff --git a/graphene/__init__.py b/graphene/__init__.py index 57e6b0ec..595e2980 100644 --- a/graphene/__init__.py +++ b/graphene/__init__.py @@ -1,38 +1,40 @@ from .pyutils.version import get_version - -from .types import ( - AbstractType, - ObjectType, - InputObjectType, - Interface, - Mutation, - Field, - InputField, - Schema, - Scalar, - String, ID, Int, Float, Boolean, - Date, DateTime, Time, - JSONString, - UUID, - List, NonNull, - Enum, - Argument, - Dynamic, - Union, - Context, - ResolveInfo -) -from .relay import ( - Node, - is_node, - GlobalID, - ClientIDMutation, - Connection, - ConnectionField, - PageInfo -) -from .utils.resolve_only_args import resolve_only_args +from .relay import ClientIDMutation +from .relay import Connection +from .relay import ConnectionField +from .relay import GlobalID +from .relay import is_node +from .relay import Node +from .relay import PageInfo +from .types import AbstractType +from .types import Argument +from .types import Boolean +from .types import Context +from .types import Date +from .types import DateTime +from .types import Dynamic +from .types import Enum +from .types import Field +from .types import Float +from .types import ID +from .types import InputField +from .types import InputObjectType +from .types import Int +from .types import Interface +from .types import JSONString +from .types import List +from .types import Mutation +from .types import NonNull +from .types import ObjectType +from .types import ResolveInfo +from .types import Scalar +from .types import Schema +from .types import String +from .types import Time +from .types import Union +from .types import UUID from .utils.module_loading import lazy_import +from .utils.resolve_only_args import resolve_only_args VERSION = (2, 1, 0, 'final', 0) diff --git a/graphene/pyutils/compat.py b/graphene/pyutils/compat.py index 86452081..ef27f356 100644 --- a/graphene/pyutils/compat.py +++ b/graphene/pyutils/compat.py @@ -1,4 +1,5 @@ from __future__ import absolute_import + import six try: diff --git a/graphene/pyutils/enum.py b/graphene/pyutils/enum.py index 076b6a9d..7bccc786 100644 --- a/graphene/pyutils/enum.py +++ b/graphene/pyutils/enum.py @@ -1,5 +1,4 @@ """Python Enumerations""" - import sys as _sys __all__ = ['Enum', 'IntEnum', 'unique'] diff --git a/graphene/pyutils/signature.py b/graphene/pyutils/signature.py index 9d94a6ef..3a2522a9 100644 --- a/graphene/pyutils/signature.py +++ b/graphene/pyutils/signature.py @@ -3,12 +3,14 @@ Back port of Python 3.3's function signature tools from the inspect module, modified to be compatible with Python 2.7 and 3.2+. """ -from __future__ import absolute_import, division, print_function -import itertools +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function + import functools +import itertools import re import types - from collections import OrderedDict __version__ = "0.4" diff --git a/graphene/pyutils/tests/test_enum.py b/graphene/pyutils/tests/test_enum.py index 8854f4c2..f11a40cf 100644 --- a/graphene/pyutils/tests/test_enum.py +++ b/graphene/pyutils/tests/test_enum.py @@ -1,4 +1,5 @@ -from ..enum import _is_dunder, _is_sunder +from ..enum import _is_dunder +from ..enum import _is_sunder def test__is_dunder(): diff --git a/graphene/relay/__init__.py b/graphene/relay/__init__.py index 8cc26ebf..c191be17 100644 --- a/graphene/relay/__init__.py +++ b/graphene/relay/__init__.py @@ -1,6 +1,10 @@ -from .node import Node, is_node, GlobalID +from .connection import Connection +from .connection import ConnectionField +from .connection import PageInfo from .mutation import ClientIDMutation -from .connection import Connection, ConnectionField, PageInfo +from .node import GlobalID +from .node import is_node +from .node import Node __all__ = [ 'Node', diff --git a/graphene/relay/connection.py b/graphene/relay/connection.py index bcd238d3..d9a82170 100644 --- a/graphene/relay/connection.py +++ b/graphene/relay/connection.py @@ -1,14 +1,24 @@ import re -from collections import Iterable, OrderedDict +from collections import Iterable +from collections import OrderedDict from functools import partial from graphql_relay import connection_from_list -from promise import Promise, is_thenable +from promise import is_thenable +from promise import Promise -from ..types import (Boolean, Enum, Int, Interface, List, NonNull, Scalar, - String, Union) +from ..types import Boolean +from ..types import Enum +from ..types import Int +from ..types import Interface +from ..types import List +from ..types import NonNull +from ..types import Scalar +from ..types import String +from ..types import Union from ..types.field import Field -from ..types.objecttype import ObjectType, ObjectTypeOptions +from ..types.objecttype import ObjectType +from ..types.objecttype import ObjectTypeOptions from .node import is_node diff --git a/graphene/relay/mutation.py b/graphene/relay/mutation.py index 2f6d1ce5..81834970 100644 --- a/graphene/relay/mutation.py +++ b/graphene/relay/mutation.py @@ -1,9 +1,12 @@ import re from collections import OrderedDict -from promise import Promise, is_thenable +from promise import is_thenable +from promise import Promise -from ..types import Field, InputObjectType, String +from ..types import Field +from ..types import InputObjectType +from ..types import String from ..types.mutation import Mutation diff --git a/graphene/relay/node.py b/graphene/relay/node.py index 6596757c..06725096 100644 --- a/graphene/relay/node.py +++ b/graphene/relay/node.py @@ -2,9 +2,13 @@ from collections import OrderedDict from functools import partial from inspect import isclass -from graphql_relay import from_global_id, to_global_id +from graphql_relay import from_global_id +from graphql_relay import to_global_id -from ..types import ID, Field, Interface, ObjectType +from ..types import Field +from ..types import ID +from ..types import Interface +from ..types import ObjectType from ..types.interface import InterfaceOptions from ..types.utils import get_type diff --git a/graphene/relay/tests/test_connection.py b/graphene/relay/tests/test_connection.py index c206f714..a3fbc4a9 100644 --- a/graphene/relay/tests/test_connection.py +++ b/graphene/relay/tests/test_connection.py @@ -1,7 +1,16 @@ import pytest -from ...types import Argument, Field, Int, List, NonNull, ObjectType, String, Schema -from ..connection import Connection, ConnectionField, PageInfo +from ...types import Argument +from ...types import Field +from ...types import Int +from ...types import List +from ...types import NonNull +from ...types import ObjectType +from ...types import Schema +from ...types import String +from ..connection import Connection +from ..connection import ConnectionField +from ..connection import PageInfo from ..node import Node diff --git a/graphene/relay/tests/test_connection_query.py b/graphene/relay/tests/test_connection_query.py index b8150e64..00bba741 100644 --- a/graphene/relay/tests/test_connection_query.py +++ b/graphene/relay/tests/test_connection_query.py @@ -3,8 +3,12 @@ from collections import OrderedDict from graphql_relay.utils import base64 from promise import Promise -from ...types import ObjectType, Schema, String -from ..connection import Connection, ConnectionField, PageInfo +from ...types import ObjectType +from ...types import Schema +from ...types import String +from ..connection import Connection +from ..connection import ConnectionField +from ..connection import PageInfo from ..node import Node letter_chars = ['A', 'B', 'C', 'D', 'E'] diff --git a/graphene/relay/tests/test_global_id.py b/graphene/relay/tests/test_global_id.py index 6301f954..23a56550 100644 --- a/graphene/relay/tests/test_global_id.py +++ b/graphene/relay/tests/test_global_id.py @@ -1,8 +1,12 @@ from graphql_relay import to_global_id -from ...types import ID, NonNull, ObjectType, String +from ...types import ID +from ...types import NonNull +from ...types import ObjectType +from ...types import String from ...types.definitions import GrapheneObjectType -from ..node import GlobalID, Node +from ..node import GlobalID +from ..node import Node class CustomNode(Node): diff --git a/graphene/relay/tests/test_mutation.py b/graphene/relay/tests/test_mutation.py index aa5ce179..4466ad8b 100644 --- a/graphene/relay/tests/test_mutation.py +++ b/graphene/relay/tests/test_mutation.py @@ -1,9 +1,14 @@ import pytest - from promise import Promise -from ...types import (ID, Argument, Field, InputField, InputObjectType, - NonNull, ObjectType, Schema) +from ...types import Argument +from ...types import Field +from ...types import ID +from ...types import InputField +from ...types import InputObjectType +from ...types import NonNull +from ...types import ObjectType +from ...types import Schema from ...types.scalars import String from ..mutation import ClientIDMutation diff --git a/graphene/relay/tests/test_node.py b/graphene/relay/tests/test_node.py index 10dc5d94..9f10d6b3 100644 --- a/graphene/relay/tests/test_node.py +++ b/graphene/relay/tests/test_node.py @@ -2,8 +2,11 @@ from collections import OrderedDict from graphql_relay import to_global_id -from ...types import ObjectType, Schema, String -from ..node import Node, is_node +from ...types import ObjectType +from ...types import Schema +from ...types import String +from ..node import is_node +from ..node import Node class SharedNodeFields(object): diff --git a/graphene/relay/tests/test_node_custom.py b/graphene/relay/tests/test_node_custom.py index 80124c0d..668454eb 100644 --- a/graphene/relay/tests/test_node_custom.py +++ b/graphene/relay/tests/test_node_custom.py @@ -1,7 +1,10 @@ from graphql import graphql -from ...types import Interface, ObjectType, Schema -from ...types.scalars import Int, String +from ...types import Interface +from ...types import ObjectType +from ...types import Schema +from ...types.scalars import Int +from ...types.scalars import String from ..node import Node diff --git a/graphene/test/__init__.py b/graphene/test/__init__.py index f7823f48..4870808f 100644 --- a/graphene/test/__init__.py +++ b/graphene/test/__init__.py @@ -1,7 +1,8 @@ -from promise import Promise, is_thenable import six from graphql.error import format_error as format_graphql_error from graphql.error import GraphQLError +from promise import is_thenable +from promise import Promise from graphene.types.schema import Schema diff --git a/graphene/tests/issues/test_313.py b/graphene/tests/issues/test_313.py index 9df6c17b..438320fc 100644 --- a/graphene/tests/issues/test_313.py +++ b/graphene/tests/issues/test_313.py @@ -1,5 +1,4 @@ # https://github.com/graphql-python/graphene/issues/313 - import graphene from graphene import resolve_only_args diff --git a/graphene/tests/issues/test_356.py b/graphene/tests/issues/test_356.py index 8eeaed10..2703a323 100644 --- a/graphene/tests/issues/test_356.py +++ b/graphene/tests/issues/test_356.py @@ -1,5 +1,4 @@ # https://github.com/graphql-python/graphene/issues/356 - import pytest import graphene diff --git a/graphene/tests/issues/test_425.py b/graphene/tests/issues/test_425.py index d50edf84..d8f9e626 100644 --- a/graphene/tests/issues/test_425.py +++ b/graphene/tests/issues/test_425.py @@ -1,9 +1,11 @@ # https://github.com/graphql-python/graphene/issues/425 # Adapted for Graphene 2.0 - -from graphene.types.objecttype import ObjectType, ObjectTypeOptions -from graphene.types.inputobjecttype import InputObjectType, InputObjectTypeOptions -from graphene.types.enum import Enum, EnumOptions +from graphene.types.enum import Enum +from graphene.types.enum import EnumOptions +from graphene.types.inputobjecttype import InputObjectType +from graphene.types.inputobjecttype import InputObjectTypeOptions +from graphene.types.objecttype import ObjectType +from graphene.types.objecttype import ObjectTypeOptions # ObjectType diff --git a/graphene/tests/issues/test_490.py b/graphene/tests/issues/test_490.py index 9bd00590..8c050b6c 100644 --- a/graphene/tests/issues/test_490.py +++ b/graphene/tests/issues/test_490.py @@ -1,5 +1,4 @@ # https://github.com/graphql-python/graphene/issues/313 - import graphene diff --git a/graphene/types/__init__.py b/graphene/types/__init__.py index b5b9427c..d068f67e 100644 --- a/graphene/types/__init__.py +++ b/graphene/types/__init__.py @@ -1,26 +1,33 @@ # flake8: noqa from graphql import ResolveInfo -from .objecttype import ObjectType -from .interface import Interface -from .mutation import Mutation -from .scalars import Scalar, String, ID, Int, Float, Boolean -from .datetime import Date, DateTime, Time -from .json import JSONString -from .uuid import UUID -from .schema import Schema -from .structures import List, NonNull +from .abstracttype import AbstractType +from .argument import Argument +from .context import Context +from .datetime import Date +from .datetime import DateTime +from .datetime import Time +from .dynamic import Dynamic from .enum import Enum from .field import Field from .inputfield import InputField -from .argument import Argument from .inputobjecttype import InputObjectType -from .dynamic import Dynamic +from .interface import Interface +from .json import JSONString +from .mutation import Mutation +from .objecttype import ObjectType +from .scalars import Boolean +from .scalars import Float +from .scalars import ID +from .scalars import Int +from .scalars import Scalar +from .scalars import String +from .schema import Schema +from .structures import List +from .structures import NonNull from .union import Union -from .context import Context - +from .uuid import UUID # Deprecated -from .abstracttype import AbstractType __all__ = [ diff --git a/graphene/types/abstracttype.py b/graphene/types/abstracttype.py index aaa0ff37..9d84d819 100644 --- a/graphene/types/abstracttype.py +++ b/graphene/types/abstracttype.py @@ -1,5 +1,5 @@ -from ..utils.subclass_with_meta import SubclassWithMeta from ..utils.deprecated import warn_deprecation +from ..utils.subclass_with_meta import SubclassWithMeta class AbstractType(SubclassWithMeta): diff --git a/graphene/types/datetime.py b/graphene/types/datetime.py index b750ea01..2a4d3f03 100644 --- a/graphene/types/datetime.py +++ b/graphene/types/datetime.py @@ -2,8 +2,10 @@ from __future__ import absolute_import import datetime +from aniso8601 import parse_date +from aniso8601 import parse_datetime +from aniso8601 import parse_time from graphql.language import ast -from aniso8601 import parse_datetime, parse_date, parse_time from .scalars import Scalar diff --git a/graphene/types/definitions.py b/graphene/types/definitions.py index 1fdb2d47..cd06cff0 100644 --- a/graphene/types/definitions.py +++ b/graphene/types/definitions.py @@ -1,6 +1,9 @@ -from graphql import (GraphQLEnumType, GraphQLInputObjectType, - GraphQLInterfaceType, GraphQLObjectType, - GraphQLScalarType, GraphQLUnionType) +from graphql import GraphQLEnumType +from graphql import GraphQLInputObjectType +from graphql import GraphQLInterfaceType +from graphql import GraphQLObjectType +from graphql import GraphQLScalarType +from graphql import GraphQLUnionType class GrapheneGraphQLType(object): diff --git a/graphene/types/enum.py b/graphene/types/enum.py index 67a3f6b2..2557b81e 100644 --- a/graphene/types/enum.py +++ b/graphene/types/enum.py @@ -2,12 +2,11 @@ from collections import OrderedDict import six -from graphene.utils.subclass_with_meta import SubclassWithMeta_Meta - -from .base import BaseOptions, BaseType -from .unmountedtype import UnmountedType - from ..pyutils.compat import Enum as PyEnum +from .base import BaseOptions +from .base import BaseType +from .unmountedtype import UnmountedType +from graphene.utils.subclass_with_meta import SubclassWithMeta_Meta def eq_enum(self, other): diff --git a/graphene/types/field.py b/graphene/types/field.py index 4a79fcac..6cc59289 100644 --- a/graphene/types/field.py +++ b/graphene/types/field.py @@ -1,8 +1,10 @@ import inspect -from collections import Mapping, OrderedDict +from collections import Mapping +from collections import OrderedDict from functools import partial -from .argument import Argument, to_arguments +from .argument import Argument +from .argument import to_arguments from .mountedtype import MountedType from .structures import NonNull from .unmountedtype import UnmountedType diff --git a/graphene/types/generic.py b/graphene/types/generic.py index 3170e38d..2aec1b3a 100644 --- a/graphene/types/generic.py +++ b/graphene/types/generic.py @@ -1,10 +1,15 @@ from __future__ import unicode_literals -from graphene.types.scalars import MAX_INT, MIN_INT -from graphql.language.ast import (BooleanValue, FloatValue, IntValue, - ListValue, ObjectValue, StringValue) +from graphql.language.ast import BooleanValue +from graphql.language.ast import FloatValue +from graphql.language.ast import IntValue +from graphql.language.ast import ListValue +from graphql.language.ast import ObjectValue +from graphql.language.ast import StringValue from .scalars import Scalar +from graphene.types.scalars import MAX_INT +from graphene.types.scalars import MIN_INT class GenericScalar(Scalar): diff --git a/graphene/types/inputobjecttype.py b/graphene/types/inputobjecttype.py index dbfccc46..db1bc3c3 100644 --- a/graphene/types/inputobjecttype.py +++ b/graphene/types/inputobjecttype.py @@ -1,6 +1,7 @@ from collections import OrderedDict -from .base import BaseOptions, BaseType +from .base import BaseOptions +from .base import BaseType from .inputfield import InputField from .unmountedtype import UnmountedType from .utils import yank_fields_from_attrs diff --git a/graphene/types/interface.py b/graphene/types/interface.py index dbc3b476..4ee020dc 100644 --- a/graphene/types/interface.py +++ b/graphene/types/interface.py @@ -1,6 +1,7 @@ from collections import OrderedDict -from .base import BaseOptions, BaseType +from .base import BaseOptions +from .base import BaseType from .field import Field from .utils import yank_fields_from_attrs diff --git a/graphene/types/mutation.py b/graphene/types/mutation.py index 6b864e07..b52118d1 100644 --- a/graphene/types/mutation.py +++ b/graphene/types/mutation.py @@ -1,11 +1,12 @@ from collections import OrderedDict +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 .objecttype import ObjectType, ObjectTypeOptions +from .objecttype import ObjectType +from .objecttype import ObjectTypeOptions from .utils import yank_fields_from_attrs -from ..utils.deprecated import warn_deprecation # For static type checking with Mypy diff --git a/graphene/types/objecttype.py b/graphene/types/objecttype.py index c6e4d5d7..ebed22d0 100644 --- a/graphene/types/objecttype.py +++ b/graphene/types/objecttype.py @@ -1,6 +1,7 @@ from collections import OrderedDict -from .base import BaseOptions, BaseType +from .base import BaseOptions +from .base import BaseType from .field import Field from .interface import Interface from .utils import yank_fields_from_attrs diff --git a/graphene/types/scalars.py b/graphene/types/scalars.py index 3b78185d..048a856b 100644 --- a/graphene/types/scalars.py +++ b/graphene/types/scalars.py @@ -1,9 +1,11 @@ import six +from graphql.language.ast import BooleanValue +from graphql.language.ast import FloatValue +from graphql.language.ast import IntValue +from graphql.language.ast import StringValue -from graphql.language.ast import (BooleanValue, FloatValue, IntValue, - StringValue) - -from .base import BaseOptions, BaseType +from .base import BaseOptions +from .base import BaseType from .unmountedtype import UnmountedType diff --git a/graphene/types/schema.py b/graphene/types/schema.py index 7fd513b2..315ef4fb 100644 --- a/graphene/types/schema.py +++ b/graphene/types/schema.py @@ -1,15 +1,20 @@ import inspect -from graphql import GraphQLSchema, graphql, is_type, GraphQLObjectType -from graphql.type.directives import (GraphQLDirective, GraphQLIncludeDirective, - GraphQLSkipDirective) +from graphql import graphql +from graphql import GraphQLObjectType +from graphql import GraphQLSchema +from graphql import is_type +from graphql.type.directives import GraphQLDirective +from graphql.type.directives import GraphQLIncludeDirective +from graphql.type.directives import GraphQLSkipDirective from graphql.type.introspection import IntrospectionSchema from graphql.utils.introspection_query import introspection_query from graphql.utils.schema_printer import print_schema from .definitions import GrapheneGraphQLType from .objecttype import ObjectType -from .typemap import TypeMap, is_graphene_type +from .typemap import is_graphene_type +from .typemap import TypeMap def assert_valid_root_type(_type): diff --git a/graphene/types/tests/test_abstracttype.py b/graphene/types/tests/test_abstracttype.py index 6484deb8..73144bec 100644 --- a/graphene/types/tests/test_abstracttype.py +++ b/graphene/types/tests/test_abstracttype.py @@ -1,10 +1,10 @@ import pytest +from .. import abstracttype +from ..abstracttype import AbstractType +from ..field import Field from ..objecttype import ObjectType from ..unmountedtype import UnmountedType -from ..abstracttype import AbstractType -from .. import abstracttype -from ..field import Field class MyType(ObjectType): diff --git a/graphene/types/tests/test_argument.py b/graphene/types/tests/test_argument.py index 744c9e29..d7813e92 100644 --- a/graphene/types/tests/test_argument.py +++ b/graphene/types/tests/test_argument.py @@ -2,7 +2,8 @@ from functools import partial import pytest -from ..argument import Argument, to_arguments +from ..argument import Argument +from ..argument import to_arguments from ..field import Field from ..inputfield import InputField from ..scalars import String diff --git a/graphene/types/tests/test_base.py b/graphene/types/tests/test_base.py index 18ba6774..3dfc689b 100644 --- a/graphene/types/tests/test_base.py +++ b/graphene/types/tests/test_base.py @@ -1,6 +1,7 @@ import pytest -from ..base import BaseType, BaseOptions +from ..base import BaseOptions +from ..base import BaseType class CustomOptions(BaseOptions): diff --git a/graphene/types/tests/test_datetime.py b/graphene/types/tests/test_datetime.py index 2d79d9f7..bfaae200 100644 --- a/graphene/types/tests/test_datetime.py +++ b/graphene/types/tests/test_datetime.py @@ -1,10 +1,11 @@ import datetime import pytz - from graphql import GraphQLError -from ..datetime import DateTime, Date, Time +from ..datetime import Date +from ..datetime import DateTime +from ..datetime import Time from ..objecttype import ObjectType from ..schema import Schema diff --git a/graphene/types/tests/test_definition.py b/graphene/types/tests/test_definition.py index af9168c9..48ddf056 100644 --- a/graphene/types/tests/test_definition.py +++ b/graphene/types/tests/test_definition.py @@ -1,5 +1,3 @@ - - from ..argument import Argument from ..enum import Enum from ..field import Field @@ -7,9 +5,12 @@ from ..inputfield import InputField from ..inputobjecttype import InputObjectType from ..interface import Interface from ..objecttype import ObjectType -from ..scalars import Boolean, Int, String +from ..scalars import Boolean +from ..scalars import Int +from ..scalars import String from ..schema import Schema -from ..structures import List, NonNull +from ..structures import List +from ..structures import NonNull from ..union import Union diff --git a/graphene/types/tests/test_dynamic.py b/graphene/types/tests/test_dynamic.py index 4e72395f..29ca8b6b 100644 --- a/graphene/types/tests/test_dynamic.py +++ b/graphene/types/tests/test_dynamic.py @@ -1,6 +1,7 @@ from ..dynamic import Dynamic from ..scalars import String -from ..structures import List, NonNull +from ..structures import List +from ..structures import NonNull def test_dynamic(): diff --git a/graphene/types/tests/test_enum.py b/graphene/types/tests/test_enum.py index fdd5f4e4..259803c8 100644 --- a/graphene/types/tests/test_enum.py +++ b/graphene/types/tests/test_enum.py @@ -1,10 +1,12 @@ import six -from ..schema import Schema, ObjectType from ..argument import Argument -from ..enum import Enum, PyEnum +from ..enum import Enum +from ..enum import PyEnum from ..field import Field from ..inputfield import InputField +from ..schema import ObjectType +from ..schema import Schema def test_enum_construction(): diff --git a/graphene/types/tests/test_inputobjecttype.py b/graphene/types/tests/test_inputobjecttype.py index 9f90055d..cf981f29 100644 --- a/graphene/types/tests/test_inputobjecttype.py +++ b/graphene/types/tests/test_inputobjecttype.py @@ -1,12 +1,12 @@ - from ..argument import Argument from ..field import Field from ..inputfield import InputField from ..inputobjecttype import InputObjectType from ..objecttype import ObjectType -from ..unmountedtype import UnmountedType -from ..scalars import String, Boolean +from ..scalars import Boolean +from ..scalars import String from ..schema import Schema +from ..unmountedtype import UnmountedType class MyType(object): diff --git a/graphene/types/tests/test_json.py b/graphene/types/tests/test_json.py index c33bd696..fc88fdc6 100644 --- a/graphene/types/tests/test_json.py +++ b/graphene/types/tests/test_json.py @@ -1,4 +1,3 @@ - from ..json import JSONString from ..objecttype import ObjectType from ..schema import Schema diff --git a/graphene/types/tests/test_mountedtype.py b/graphene/types/tests/test_mountedtype.py index 9dcc11c7..989ccb2d 100644 --- a/graphene/types/tests/test_mountedtype.py +++ b/graphene/types/tests/test_mountedtype.py @@ -1,4 +1,3 @@ - from ..field import Field from ..scalars import String diff --git a/graphene/types/tests/test_objecttype.py b/graphene/types/tests/test_objecttype.py index 73d3823c..766f62fe 100644 --- a/graphene/types/tests/test_objecttype.py +++ b/graphene/types/tests/test_objecttype.py @@ -3,10 +3,10 @@ import pytest from ..field import Field from ..interface import Interface from ..objecttype import ObjectType -from ..unmountedtype import UnmountedType -from ..structures import NonNull from ..scalars import String from ..schema import Schema +from ..structures import NonNull +from ..unmountedtype import UnmountedType class MyType(Interface): diff --git a/graphene/types/tests/test_query.py b/graphene/types/tests/test_query.py index a106af25..25c396f9 100644 --- a/graphene/types/tests/test_query.py +++ b/graphene/types/tests/test_query.py @@ -1,19 +1,26 @@ import json from functools import partial -from graphql import GraphQLError, Source, execute, parse, ResolveInfo +from graphql import execute +from graphql import GraphQLError +from graphql import parse +from graphql import ResolveInfo +from graphql import Source +from ..context import Context from ..dynamic import Dynamic from ..field import Field from ..inputfield import InputField from ..inputobjecttype import InputObjectType from ..interface import Interface from ..objecttype import ObjectType -from ..scalars import Int, String, Boolean +from ..scalars import Boolean +from ..scalars import Int +from ..scalars import String from ..schema import Schema -from ..structures import List, NonNull +from ..structures import List +from ..structures import NonNull from ..union import Union -from ..context import Context def test_query(): diff --git a/graphene/types/tests/test_resolver.py b/graphene/types/tests/test_resolver.py index 2beb607e..abf45aef 100644 --- a/graphene/types/tests/test_resolver.py +++ b/graphene/types/tests/test_resolver.py @@ -1,6 +1,7 @@ - -from ..resolver import (attr_resolver, dict_resolver, get_default_resolver, - set_default_resolver) +from ..resolver import attr_resolver +from ..resolver import dict_resolver +from ..resolver import get_default_resolver +from ..resolver import set_default_resolver args = {} context = None diff --git a/graphene/types/tests/test_scalar.py b/graphene/types/tests/test_scalar.py index 3c6383fa..cc5ed676 100644 --- a/graphene/types/tests/test_scalar.py +++ b/graphene/types/tests/test_scalar.py @@ -1,4 +1,3 @@ - from ..scalars import Scalar diff --git a/graphene/types/tests/test_scalars_serialization.py b/graphene/types/tests/test_scalars_serialization.py index eab09e64..38bf1a8d 100644 --- a/graphene/types/tests/test_scalars_serialization.py +++ b/graphene/types/tests/test_scalars_serialization.py @@ -1,4 +1,7 @@ -from ..scalars import Boolean, Float, Int, String +from ..scalars import Boolean +from ..scalars import Float +from ..scalars import Int +from ..scalars import String def test_serializes_output_int(): diff --git a/graphene/types/tests/test_structures.py b/graphene/types/tests/test_structures.py index 6fb290fd..5bc8c4f8 100644 --- a/graphene/types/tests/test_structures.py +++ b/graphene/types/tests/test_structures.py @@ -3,7 +3,8 @@ from functools import partial import pytest from ..scalars import String -from ..structures import List, NonNull +from ..structures import List +from ..structures import NonNull from .utils import MyLazyType diff --git a/graphene/types/tests/test_typemap.py b/graphene/types/tests/test_typemap.py index c0626a1a..72836e6e 100644 --- a/graphene/types/tests/test_typemap.py +++ b/graphene/types/tests/test_typemap.py @@ -1,11 +1,14 @@ import pytest +from graphql.type import GraphQLArgument +from graphql.type import GraphQLEnumType +from graphql.type import GraphQLEnumValue +from graphql.type import GraphQLField +from graphql.type import GraphQLInputObjectField +from graphql.type import GraphQLInputObjectType +from graphql.type import GraphQLInterfaceType +from graphql.type import GraphQLObjectType +from graphql.type import GraphQLString -from graphql.type import (GraphQLArgument, GraphQLEnumType, GraphQLEnumValue, - GraphQLField, GraphQLInputObjectField, - GraphQLInputObjectType, GraphQLInterfaceType, - GraphQLObjectType, GraphQLString) - -from ..structures import List, NonNull from ..dynamic import Dynamic from ..enum import Enum from ..field import Field @@ -13,8 +16,12 @@ from ..inputfield import InputField from ..inputobjecttype import InputObjectType from ..interface import Interface from ..objecttype import ObjectType -from ..scalars import String, Int -from ..typemap import TypeMap, resolve_type +from ..scalars import Int +from ..scalars import String +from ..structures import List +from ..structures import NonNull +from ..typemap import resolve_type +from ..typemap import TypeMap def test_enum(): diff --git a/graphene/types/tests/test_uuid.py b/graphene/types/tests/test_uuid.py index f1499e35..188ebcb8 100644 --- a/graphene/types/tests/test_uuid.py +++ b/graphene/types/tests/test_uuid.py @@ -1,6 +1,6 @@ -from ..uuid import UUID from ..objecttype import ObjectType from ..schema import Schema +from ..uuid import UUID class Query(ObjectType): diff --git a/graphene/types/typemap.py b/graphene/types/typemap.py index b2bc4a0e..cc59ed25 100644 --- a/graphene/types/typemap.py +++ b/graphene/types/typemap.py @@ -2,19 +2,29 @@ import inspect from collections import OrderedDict from functools import partial -from graphql import (GraphQLArgument, GraphQLBoolean, GraphQLField, - GraphQLFloat, GraphQLID, GraphQLInputObjectField, - GraphQLInt, GraphQLList, GraphQLNonNull, GraphQLString) +from graphql import GraphQLArgument +from graphql import GraphQLBoolean +from graphql import GraphQLField +from graphql import GraphQLFloat +from graphql import GraphQLID +from graphql import GraphQLInputObjectField +from graphql import GraphQLInt +from graphql import GraphQLList +from graphql import GraphQLNonNull +from graphql import GraphQLString from graphql.execution.executor import get_default_resolve_type_fn from graphql.type import GraphQLEnumValue from graphql.type.typemap import GraphQLTypeMap from ..utils.get_unbound_function import get_unbound_function from ..utils.str_converters import to_camel_case -from .definitions import (GrapheneEnumType, GrapheneGraphQLType, - GrapheneInputObjectType, GrapheneInterfaceType, - GrapheneObjectType, GrapheneScalarType, - GrapheneUnionType) +from .definitions import GrapheneEnumType +from .definitions import GrapheneGraphQLType +from .definitions import GrapheneInputObjectType +from .definitions import GrapheneInterfaceType +from .definitions import GrapheneObjectType +from .definitions import GrapheneScalarType +from .definitions import GrapheneUnionType from .dynamic import Dynamic from .enum import Enum from .field import Field @@ -22,8 +32,14 @@ from .inputobjecttype import InputObjectType from .interface import Interface from .objecttype import ObjectType from .resolver import get_default_resolver -from .scalars import ID, Boolean, Float, Int, Scalar, String -from .structures import List, NonNull +from .scalars import Boolean +from .scalars import Float +from .scalars import ID +from .scalars import Int +from .scalars import Scalar +from .scalars import String +from .structures import List +from .structures import NonNull from .union import Union from .utils import get_field_as diff --git a/graphene/types/union.py b/graphene/types/union.py index c5925e88..de78785e 100644 --- a/graphene/types/union.py +++ b/graphene/types/union.py @@ -1,4 +1,5 @@ -from .base import BaseOptions, BaseType +from .base import BaseOptions +from .base import BaseType from .unmountedtype import UnmountedType diff --git a/graphene/utils/annotate.py b/graphene/utils/annotate.py index 51a87a78..12f1e039 100644 --- a/graphene/utils/annotate.py +++ b/graphene/utils/annotate.py @@ -1,6 +1,7 @@ import six -from ..pyutils.compat import signature, func_name +from ..pyutils.compat import func_name +from ..pyutils.compat import signature from .deprecated import warn_deprecation diff --git a/graphene/utils/resolve_only_args.py b/graphene/utils/resolve_only_args.py index 897e6223..7862dedd 100644 --- a/graphene/utils/resolve_only_args.py +++ b/graphene/utils/resolve_only_args.py @@ -1,4 +1,5 @@ from functools import wraps + from .deprecated import deprecated diff --git a/graphene/utils/subclass_with_meta.py b/graphene/utils/subclass_with_meta.py index 61205be0..b0c8dee2 100644 --- a/graphene/utils/subclass_with_meta.py +++ b/graphene/utils/subclass_with_meta.py @@ -1,6 +1,7 @@ -import six from inspect import isclass +import six + from ..pyutils.init_subclass import InitSubclassMeta from .props import props diff --git a/graphene/utils/tests/test_annotate.py b/graphene/utils/tests/test_annotate.py index e4930b62..446fbbfe 100644 --- a/graphene/utils/tests/test_annotate.py +++ b/graphene/utils/tests/test_annotate.py @@ -1,4 +1,5 @@ import pytest + from ..annotate import annotate diff --git a/graphene/utils/tests/test_deprecated.py b/graphene/utils/tests/test_deprecated.py index cd0e2dcb..0af06763 100644 --- a/graphene/utils/tests/test_deprecated.py +++ b/graphene/utils/tests/test_deprecated.py @@ -1,6 +1,8 @@ import pytest + from .. import deprecated -from ..deprecated import deprecated as deprecated_decorator, warn_deprecation +from ..deprecated import deprecated as deprecated_decorator +from ..deprecated import warn_deprecation def test_warn_deprecation(mocker): diff --git a/graphene/utils/tests/test_module_loading.py b/graphene/utils/tests/test_module_loading.py index dd67ffe1..3eb52251 100644 --- a/graphene/utils/tests/test_module_loading.py +++ b/graphene/utils/tests/test_module_loading.py @@ -1,8 +1,9 @@ from pytest import raises -from graphene import ObjectType, String - -from ..module_loading import import_string, lazy_import +from ..module_loading import import_string +from ..module_loading import lazy_import +from graphene import ObjectType +from graphene import String def test_import_string(): diff --git a/graphene/utils/tests/test_resolve_only_args.py b/graphene/utils/tests/test_resolve_only_args.py index 35554e9b..11a6bbdb 100644 --- a/graphene/utils/tests/test_resolve_only_args.py +++ b/graphene/utils/tests/test_resolve_only_args.py @@ -1,5 +1,5 @@ -from ..resolve_only_args import resolve_only_args from .. import deprecated +from ..resolve_only_args import resolve_only_args def test_resolve_only_args(mocker): diff --git a/graphene/utils/tests/test_str_converters.py b/graphene/utils/tests/test_str_converters.py index 11f7e155..d6552d07 100644 --- a/graphene/utils/tests/test_str_converters.py +++ b/graphene/utils/tests/test_str_converters.py @@ -1,5 +1,7 @@ # coding: utf-8 -from ..str_converters import to_camel_case, to_const, to_snake_case +from ..str_converters import to_camel_case +from ..str_converters import to_const +from ..str_converters import to_snake_case def test_snake_case(): diff --git a/setup.py b/setup.py index 102f46c4..852ace05 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,10 @@ -from setuptools import find_packages, setup -from setuptools.command.test import test as TestCommand -import sys import ast import re +import sys + +from setuptools import find_packages +from setuptools import setup +from setuptools.command.test import test as TestCommand _version_re = re.compile(r'VERSION\s+=\s+(.*)')