From 5282627537981d780381bcf2b9e7df22ffa08671 Mon Sep 17 00:00:00 2001 From: Syrus Akbary Date: Fri, 13 Nov 2015 18:58:20 -0800 Subject: [PATCH] Rewrite imports to be relative instead of absolute --- graphene/contrib/django/converter.py | 5 ++--- graphene/contrib/django/fields.py | 16 ++++++++-------- graphene/contrib/django/options.py | 6 +++--- graphene/contrib/django/types.py | 12 ++++++------ graphene/contrib/django/utils.py | 2 +- graphene/core/options.py | 2 +- graphene/core/schema.py | 5 +++-- graphene/core/types/argument.py | 2 +- graphene/core/types/objecttype.py | 12 +++++++----- graphene/core/types/tests/test_argument.py | 2 +- graphene/core/types/tests/test_base.py | 2 +- graphene/relay/__init__.py | 6 +++--- graphene/relay/fields.py | 7 ++++--- graphene/relay/types.py | 15 ++++++++------- graphene/relay/utils.py | 2 +- 15 files changed, 50 insertions(+), 46 deletions(-) diff --git a/graphene/contrib/django/converter.py b/graphene/contrib/django/converter.py index 29b52dec..5dc34aba 100644 --- a/graphene/contrib/django/converter.py +++ b/graphene/contrib/django/converter.py @@ -1,9 +1,8 @@ from django.db import models from singledispatch import singledispatch -from graphene.contrib.django.fields import (ConnectionOrListField, - DjangoModelField) -from graphene.core.types.scalars import ID, Boolean, Float, Int, String +from ...core.types.scalars import ID, Boolean, Float, Int, String +from .fields import ConnectionOrListField, DjangoModelField try: UUIDField = models.UUIDField diff --git a/graphene/contrib/django/fields.py b/graphene/contrib/django/fields.py index d76e984e..8cc7838e 100644 --- a/graphene/contrib/django/fields.py +++ b/graphene/contrib/django/fields.py @@ -1,13 +1,13 @@ -from graphene import relay -from graphene.contrib.django.utils import get_type_for_model, lazy_map -from graphene.core.exceptions import SkipField -from graphene.core.fields import Field -from graphene.core.types.base import FieldType -from graphene.core.types.definitions import List -from graphene.relay.utils import is_node +from ...core.exceptions import SkipField +from ...core.fields import Field +from ...core.types.base import FieldType +from ...core.types.definitions import List +from ...relay import ConnectionField +from ...relay.utils import is_node +from .utils import get_type_for_model, lazy_map -class DjangoConnectionField(relay.ConnectionField): +class DjangoConnectionField(ConnectionField): def wrap_resolved(self, value, instance, args, info): schema = info.schema.graphene_schema diff --git a/graphene/contrib/django/options.py b/graphene/contrib/django/options.py index a65ce52d..812e2b03 100644 --- a/graphene/contrib/django/options.py +++ b/graphene/contrib/django/options.py @@ -2,9 +2,9 @@ import inspect from django.db import models -from graphene.core.options import Options -from graphene.relay.types import Node -from graphene.relay.utils import is_node +from ...core.options import Options +from ...relay.types import Node +from ...relay.utils import is_node VALID_ATTRS = ('model', 'only_fields', 'exclude_fields') diff --git a/graphene/contrib/django/types.py b/graphene/contrib/django/types.py index 2780d33e..17e6c82e 100644 --- a/graphene/contrib/django/types.py +++ b/graphene/contrib/django/types.py @@ -1,11 +1,11 @@ import six -from graphene.contrib.django.converter import convert_django_field -from graphene.contrib.django.options import DjangoOptions -from graphene.contrib.django.utils import get_reverse_fields -from graphene.core.types import BaseObjectType, ObjectTypeMeta -from graphene.relay.fields import GlobalIDField -from graphene.relay.types import BaseNode +from ...core.types import BaseObjectType, ObjectTypeMeta +from ...relay.fields import GlobalIDField +from ...relay.types import BaseNode +from .converter import convert_django_field +from .options import DjangoOptions +from .utils import get_reverse_fields class DjangoObjectTypeMeta(ObjectTypeMeta): diff --git a/graphene/contrib/django/utils.py b/graphene/contrib/django/utils.py index 4a94741e..0d557e9a 100644 --- a/graphene/contrib/django/utils.py +++ b/graphene/contrib/django/utils.py @@ -2,7 +2,7 @@ from django.db import models from django.db.models.manager import Manager from django.db.models.query import QuerySet -from graphene.utils import LazyMap +from ...utils import LazyMap def get_type_for_model(schema, model): diff --git a/graphene/core/options.py b/graphene/core/options.py index 1a1ff691..5661fedb 100644 --- a/graphene/core/options.py +++ b/graphene/core/options.py @@ -1,6 +1,6 @@ from collections import OrderedDict -from graphene.utils import cached_property +from ..utils import cached_property DEFAULT_NAMES = ('description', 'name', 'is_interface', 'is_mutation', 'type_name', 'interfaces') diff --git a/graphene/core/schema.py b/graphene/core/schema.py index a15a10c8..b69741bc 100644 --- a/graphene/core/schema.py +++ b/graphene/core/schema.py @@ -2,14 +2,15 @@ import inspect from collections import OrderedDict from graphene import signals -from graphene.core.types.base import BaseType -from graphene.core.types.objecttype import BaseObjectType from graphql.core.execution.executor import Executor from graphql.core.execution.middlewares.sync import \ SynchronousExecutionMiddleware from graphql.core.type import GraphQLSchema as _GraphQLSchema from graphql.core.utils.introspection_query import introspection_query +from .types.base import BaseType +from .types.objecttype import BaseObjectType + class GraphQLSchema(_GraphQLSchema): diff --git a/graphene/core/types/argument.py b/graphene/core/types/argument.py index 0b23461b..0892c446 100644 --- a/graphene/core/types/argument.py +++ b/graphene/core/types/argument.py @@ -4,7 +4,7 @@ from itertools import chain from graphql.core.type import GraphQLArgument -from ...utils import to_camel_case, ProxySnakeDict +from ...utils import ProxySnakeDict, to_camel_case from .base import ArgumentType, BaseType, OrderedType diff --git a/graphene/core/types/objecttype.py b/graphene/core/types/objecttype.py index 3959ca37..342aeeff 100644 --- a/graphene/core/types/objecttype.py +++ b/graphene/core/types/objecttype.py @@ -6,14 +6,15 @@ from functools import partial import six from graphene import signals -from graphene.core.exceptions import SkipField -from graphene.core.options import Options -from graphene.core.types.argument import ArgumentsGroup -from graphene.core.types.base import BaseType -from graphene.core.types.definitions import List, NonNull from graphql.core.type import (GraphQLArgument, GraphQLInputObjectType, GraphQLInterfaceType, GraphQLObjectType) +from ..exceptions import SkipField +from ..options import Options +from .argument import ArgumentsGroup +from .base import BaseType +from .definitions import List, NonNull + class ObjectTypeMeta(type): options_cls = Options @@ -210,6 +211,7 @@ class ObjectType(six.with_metaclass(ObjectTypeMeta, BaseObjectType)): class Mutation(six.with_metaclass(ObjectTypeMeta, BaseObjectType)): + @classmethod def _construct_arguments(cls, items): return ArgumentsGroup(**items) diff --git a/graphene/core/types/tests/test_argument.py b/graphene/core/types/tests/test_argument.py index 73d760d5..4e54d86e 100644 --- a/graphene/core/types/tests/test_argument.py +++ b/graphene/core/types/tests/test_argument.py @@ -4,7 +4,7 @@ from graphene.core.schema import Schema from graphene.core.types import ObjectType from graphql.core.type import GraphQLArgument -from ..argument import Argument, to_arguments, snake_case_args +from ..argument import Argument, snake_case_args, to_arguments from ..scalars import String diff --git a/graphene/core/types/tests/test_base.py b/graphene/core/types/tests/test_base.py index 79d24aca..4af1eb65 100644 --- a/graphene/core/types/tests/test_base.py +++ b/graphene/core/types/tests/test_base.py @@ -4,8 +4,8 @@ from graphene.core.types import InputObjectType, ObjectType from ..argument import Argument from ..base import MountedType, OrderedType -from ..field import Field, InputField from ..definitions import List, NonNull +from ..field import Field, InputField def test_orderedtype_equal(): diff --git a/graphene/relay/__init__.py b/graphene/relay/__init__.py index 0ad18b57..9e169237 100644 --- a/graphene/relay/__init__.py +++ b/graphene/relay/__init__.py @@ -1,10 +1,10 @@ -from graphene.relay.fields import ( +from .fields import ( ConnectionField, NodeField, GlobalIDField, ) -from graphene.relay.types import ( +from .types import ( Node, PageInfo, Edge, @@ -12,7 +12,7 @@ from graphene.relay.types import ( ClientIDMutation ) -from graphene.relay.utils import is_node +from .utils import is_node __all__ = ['ConnectionField', 'NodeField', 'GlobalIDField', 'Node', 'PageInfo', 'Edge', 'Connection', 'ClientIDMutation', 'is_node'] diff --git a/graphene/relay/fields.py b/graphene/relay/fields.py index 4fa766a2..246c8e75 100644 --- a/graphene/relay/fields.py +++ b/graphene/relay/fields.py @@ -1,11 +1,12 @@ from collections import Iterable -from graphene.core.fields import Field -from graphene.core.types.definitions import NonNull -from graphene.core.types.scalars import ID, Int, String from graphql_relay.connection.arrayconnection import connection_from_list from graphql_relay.node.node import from_global_id +from ..core.fields import Field +from ..core.types.definitions import NonNull +from ..core.types.scalars import ID, Int, String + class ConnectionField(Field): diff --git a/graphene/relay/types.py b/graphene/relay/types.py index 3525dbc9..5b72e843 100644 --- a/graphene/relay/types.py +++ b/graphene/relay/types.py @@ -1,12 +1,13 @@ -from graphene.core.types import (Boolean, Field, InputObjectType, Interface, - List, Mutation, ObjectType, String) -from graphene.core.types.argument import ArgumentsGroup -from graphene.core.types.base import LazyType -from graphene.core.types.definitions import NonNull -from graphene.relay.fields import GlobalIDField -from graphene.utils import memoize from graphql_relay.node.node import to_global_id +from ..core.types import (Boolean, Field, InputObjectType, Interface, List, + Mutation, ObjectType, String) +from ..core.types.argument import ArgumentsGroup +from ..core.types.base import LazyType +from ..core.types.definitions import NonNull +from ..utils import memoize +from .fields import GlobalIDField + class PageInfo(ObjectType): has_next_page = Boolean( diff --git a/graphene/relay/utils.py b/graphene/relay/utils.py index af9d0f6c..dc281830 100644 --- a/graphene/relay/utils.py +++ b/graphene/relay/utils.py @@ -1,4 +1,4 @@ -from graphene.relay.types import BaseNode +from .types import BaseNode def is_node(object_type):