Minimize unnecesary diff

Author: Daniel Gallagher

.travis.yml

@@ -12,6 +12,8 @@ matrix:
        python: pypy-5.7.1
     -  env: TOXENV=pre-commit
        python: 3.6
+    -  env: TOXENV=mypy
+       python: 3.6
 install: pip install coveralls tox
 script: tox
 after_success: coveralls

graphql/backend/base.py

@@ -1,8 +1,10 @@
-from abc import ABCMeta, abstractmethod
 from ..pyutils.cached_property import cached_property
-import six
 from ..language import ast
 
+from abc import ABCMeta, abstractmethod
+import six
+
+
 # Necessary for static type checking
 if False:  # flake8: noqa
     from typing import Dict, Optional, Union, Callable

graphql/backend/cache.py

@@ -1,8 +1,8 @@
 from hashlib import sha1
 
 from six import string_types
-
 from ..type import GraphQLSchema
+
 from .base import GraphQLBackend
 
 # Necessary for static type checking

graphql/backend/compiled.py

@@ -1,5 +1,4 @@
 from six import string_types
-
 from .base import GraphQLDocument
 
 # Necessary for static type checking

graphql/backend/core.py

@@ -1,11 +1,11 @@
 from functools import partial
-
 from six import string_types
 
-from ..execution import ExecutionResult, execute
-from ..language import ast
+from ..execution import execute, ExecutionResult
 from ..language.base import parse, print_ast
+from ..language import ast
 from ..validation import validate
+
 from .base import GraphQLBackend, GraphQLDocument
 
 # Necessary for static type checking

graphql/backend/quiver_cloud.py

@@ -7,12 +7,12 @@
     )
 
 from ..utils.schema_printer import print_schema
+
 from .base import GraphQLBackend
 from .compiled import GraphQLCompiledDocument
 
 from six.moves.urllib.parse import urlparse
 
-
 GRAPHQL_QUERY = """
 mutation($schemaDsl: String!, $query: String!, $pythonOptions: PythonOptions) {
   generateCode(

graphql/backend/tests/test_base.py

@@ -1,6 +1,5 @@
 import pytest
-
-from .. import GraphQLCoreBackend, get_default_backend, set_default_backend
+from .. import get_default_backend, set_default_backend, GraphQLCoreBackend
 
 
 def test_get_default_backend_returns_core_by_default():

graphql/backend/tests/test_cache.py

@@ -2,12 +2,11 @@
 # -*- coding: utf-8 -*-
 """Tests for `graphql.backend.cache` module."""
 
-from graphql.execution.executors.sync import SyncExecutor
-
 import pytest
 
-from ..cache import GraphQLCachedBackend
 from ..core import GraphQLCoreBackend
+from ..cache import GraphQLCachedBackend
+from graphql.execution.executors.sync import SyncExecutor
 from .schema import schema
 
 

graphql/backend/tests/test_core.py

@@ -2,9 +2,8 @@
 # -*- coding: utf-8 -*-
 """Tests for `graphql.backend.core` module."""
 
-from graphql.execution.executors.sync import SyncExecutor
-
 import pytest
+from graphql.execution.executors.sync import SyncExecutor
 
 from ..base import GraphQLBackend, GraphQLDocument
 from ..core import GraphQLCoreBackend

graphql/backend/tests/test_decider.py

@@ -6,9 +6,10 @@
 from threading import Event
 
 from ..base import GraphQLBackend, GraphQLDocument
-from ..cache import GraphQLCachedBackend
 from ..core import GraphQLCoreBackend
+from ..cache import GraphQLCachedBackend
 from ..decider import GraphQLDeciderBackend
+
 from .schema import schema
 
 if False:

graphql/error/base.py

@@ -1,5 +1,4 @@
 import six
-
 from ..language.location import get_location
 
 # Necessary for static type checking

graphql/error/tests/test_base.py

@@ -1,3 +1,4 @@
+import pytest
 import traceback
 
 from graphql.execution import execute
@@ -10,8 +11,6 @@
     from typing import Any
     from typing import Optional
 
-import pytest
-
 
 def test_raise():
     # type: () -> None

graphql/execution/executor.py

@@ -3,10 +3,10 @@
 import logging
 import sys
 import warnings
-
-from promise import Promise, is_thenable, promise_for_dict
 from rx import Observable
+
 from six import string_types
+from promise import Promise, promise_for_dict, is_thenable
 
 from ..error import GraphQLError, GraphQLLocatedError
 from ..pyutils.default_ordered_dict import DefaultOrderedDict

graphql/execution/executors/asyncio_utils.py

@@ -1,108 +1,11 @@
 from inspect import isasyncgen  # type: ignore
 from asyncio import ensure_future, wait, CancelledError
-from inspect import isasyncgen
-
-from rx import AnonymousObserver, Observable
-from rx.concurrency import current_thread_scheduler
-from rx.core import (Disposable, Observable, ObservableBase, Observer,
-                     ObserverBase)
-from rx.core.anonymousobserver import AnonymousObserver
-from rx.core.autodetachobserver import AutoDetachObserver
 from rx import AnonymousObservable
 
 
-# class AsyncgenDisposable(Disposable):
-#     """Represents a Disposable that disposes the asyncgen automatically."""
-
-#     def __init__(self, asyncgen):
-#         """Initializes a new instance of the AsyncgenDisposable class."""
-
-#         self.asyncgen = asyncgen
-#         self.is_disposed = False
-
-#         super(AsyncgenDisposable, self).__init__()
-
-#     def dispose(self):
-#         """Sets the status to disposed"""
-#         self.asyncgen.aclose()
-#         self.is_disposed = True
-
-
-class AsyncgenObserver(AutoDetachObserver):
-    def __init__(self, asyncgen, *args, **kwargs):
-        self._asyncgen = asyncgen
-        self.is_disposed = False
-        super(AsyncgenObserver, self).__init__(*args, **kwargs)
-
-    async def dispose_asyncgen(self):
-        if self.is_disposed:
-            return
-
-        try:
-            # await self._asyncgen.aclose()
-            await self._asyncgen.athrow(StopAsyncIteration)
-            self.is_disposed = True
-        except:
-            pass
-
-    def dispose(self):
-        if self.is_disposed:
-            return
-        disposed = super(AsyncgenObserver, self).dispose()
-        # print("DISPOSE observer!", disposed)
-        ensure_future(self.dispose_asyncgen())
-
-
-class AsyncgenObservable(ObservableBase):
-    """Class to create an Observable instance from a delegate-based
-    implementation of the Subscribe method."""
-
-    def __init__(self, subscribe, asyncgen):
-        """Creates an observable sequence object from the specified
-        subscription function.
-
-        Keyword arguments:
-        :param types.FunctionType subscribe: Subscribe method implementation.
-        """
-
-        self._subscribe = subscribe
-        self._asyncgen = asyncgen
-        super(AsyncgenObservable, self).__init__()
-
-    def _subscribe_core(self, observer):
-        # print("GET SUBSCRIBER", observer)
-        return self._subscribe(observer)
-        # print("SUBSCRIBER RESULT", subscriber)
-        # return subscriber
-
-    def subscribe(self, on_next=None, on_error=None, on_completed=None, observer=None):
-
-        if isinstance(on_next, Observer):
-            observer = on_next
-        elif hasattr(on_next, "on_next") and callable(on_next.on_next):
-            observer = on_next
-        elif not observer:
-            observer = AnonymousObserver(on_next, on_error, on_completed)
-
-        auto_detach_observer = AsyncgenObserver(self._asyncgen, observer)
-
-        def fix_subscriber(subscriber):
-            """Fixes subscriber to make sure it returns a Disposable instead
-            of None or a dispose function"""
-
-            if not hasattr(subscriber, "dispose"):
-                subscriber = Disposable.create(subscriber)
-
-            return subscriber
-
-        def set_disposable(scheduler=None, value=None):
-            try:
-                subscriber = self._subscribe_core(auto_detach_observer)
-            except Exception as ex:
-                if not auto_detach_observer.fail(ex):
-                    raise
-            else:
-                auto_detach_observer.disposable = fix_subscriber(subscriber)
+def asyncgen_to_observable(asyncgen, loop=None):
+    def emit(observer):
+        task = ensure_future(iterate_asyncgen(asyncgen, observer), loop=loop)
 
         def dispose():
             async def await_task():

graphql/execution/tests/test_executor.py

@@ -1,6 +1,8 @@
 # type: ignore
 import json
 
+from pytest import raises
+
 from graphql.error import GraphQLError
 from graphql.execution import MiddlewareManager, execute
 from graphql.language.parser import parse
@@ -18,8 +20,6 @@
 )
 from promise import Promise
 
-from pytest import raises
-
 
 def test_executes_arbitary_code():
     # type: () -> None

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35,py36,pre-commit,pypy,docs
+envlist = py27,py34,py35,py36,pre-commit,pypy,mypy,docs
 
 [testenv]
 deps =
@@ -22,6 +22,13 @@ setenv =
 commands =
     pre-commit {posargs:run --all-files}
 
+[testenv:mypy]
+basepython=python3.6
+deps =
+    mypy
+commands =
+    mypy graphql --ignore-missing-imports
+
 [testenv:docs]
 changedir = docs
 deps = sphinx