Move defer to pyutils.

Author: jhgg

graphql/core/execution/base.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-from ..defer import DeferredException
 from ..error import GraphQLError
 from ..language import ast
+from ..pyutils.defer import DeferredException
 from ..type.definition import (
     GraphQLInterfaceType,
     GraphQLUnionType,

graphql/core/execution/executor.py

@@ -1,12 +1,12 @@
 import collections
 import functools
 
-from ..defer import Deferred, DeferredDict, DeferredList, defer, succeed
 from ..error import GraphQLError
 from ..language import ast
 from ..language.parser import parse
 from ..language.source import Source
 from ..pyutils.default_ordered_dict import DefaultOrderedDict
+from ..pyutils.defer import Deferred, DeferredDict, DeferredList, defer, succeed
 from ..type import GraphQLEnumType, GraphQLInterfaceType, GraphQLList, GraphQLNonNull, GraphQLObjectType, \
     GraphQLScalarType, GraphQLUnionType
 from ..validation import validate

graphql/core/execution/middlewares/asyncio.py

@@ -1,6 +1,7 @@
 # flake8: noqa
 from asyncio import Future, ensure_future, iscoroutine
-from graphql.core.defer import Deferred
+
+from ...pyutils.defer import Deferred
 
 
 def process_future_result(deferred):

graphql/core/execution/middlewares/gevent.py

@@ -2,7 +2,8 @@
 
 from gevent import get_hub, spawn
 from gevent.event import AsyncResult
-from ...defer import Deferred, DeferredException
+
+from ...pyutils.defer import Deferred, DeferredException
 from .utils import resolver_has_tag, tag_resolver
 
 

graphql/core/execution/middlewares/sync.py

@@ -1,5 +1,5 @@
-from graphql.core.defer import Deferred
-from graphql.core.error import GraphQLError
+from ...error import GraphQLError
+from ...pyutils.defer import Deferred
 
 
 class SynchronousExecutionMiddleware(object):

graphql/core/defer.py renamed to graphql/core/pyutils/defer.py

@@ -1,8 +1,7 @@
 from graphql.core.error import format_error
 from graphql.core.execution import Executor
 from graphql.core.execution.middlewares.sync import SynchronousExecutionMiddleware
-from graphql.core.defer import succeed, Deferred, fail
-from graphql.core.language.location import SourceLocation
+from graphql.core.pyutils.defer import succeed, Deferred, fail
 from graphql.core.language.parser import parse
 from graphql.core.type import (GraphQLSchema, GraphQLObjectType, GraphQLField,
                                GraphQLArgument, GraphQLList, GraphQLInt, GraphQLString)

tests/core_execution/test_concurrent_executor.py

@@ -1,5 +1,6 @@
 from pytest import raises
-from graphql.core.defer import Deferred, DeferredException, succeed, fail, DeferredList, DeferredDict, \
+
+from graphql.core.pyutils.defer import Deferred, DeferredException, succeed, fail, DeferredList, DeferredDict, \
     AlreadyCalledDeferred
 
 

tests/core_execution/test_deferred.py

@@ -1,4 +1,4 @@
-from graphql.core.defer import Deferred, DeferredException
+from graphql.core.pyutils.defer import Deferred, DeferredException
 
 
 class RaisingDeferred(Deferred):