Changed anonymous observbable static type imports

Author: syrusakbary

graphql/backend/core.py

@@ -14,7 +14,7 @@
     from ..language.ast import Document
     from ..type.schema import GraphQLSchema
     from ..execution.base import ExecutionResult
-    from rx.core.anonymousobservable import AnonymousObservable
+    from rx import Observable
 
 
 def execute_and_validate(
@@ -23,7 +23,7 @@ def execute_and_validate(
     *args,  # type: Any
     **kwargs  # type: Any
 ):
-    # type: (...) -> Union[ExecutionResult, AnonymousObservable]
+    # type: (...) -> Union[ExecutionResult, Observable]
     do_validation = kwargs.get("validate", True)
     if do_validation:
         validation_errors = validate(schema, document_ast)

graphql/execution/executor.py

@@ -37,15 +37,15 @@
 
 if False:
     from typing import Any, Optional, Union, Dict, List, Callable
-    from rx.core.anonymousobservable import AnonymousObservable
+    from rx import Observable
     from ..type.schema import GraphQLSchema
     from ..language.ast import Document, OperationDefinition, Field
 
 logger = logging.getLogger(__name__)
 
 
 def subscribe(*args, **kwargs):
-    # type: (*Any, **Any) -> Union[ExecutionResult, AnonymousObservable]
+    # type: (*Any, **Any) -> Union[ExecutionResult, Observable]
     allow_subscriptions = kwargs.pop("allow_subscriptions", True)
     return execute(*args, allow_subscriptions=allow_subscriptions, **kwargs)
 
@@ -117,7 +117,7 @@ def execute(
     )
 
     def executor(v):
-        # type: (Optional[Any]) -> Union[OrderedDict, Promise, AnonymousObservable]
+        # type: (Optional[Any]) -> Union[OrderedDict, Promise, Observable]
         return execute_operation(exe_context, exe_context.operation, root)
 
     def on_rejected(error):
@@ -126,7 +126,7 @@ def on_rejected(error):
         return None
 
     def on_resolve(data):
-        # type: (Union[None, OrderedDict, AnonymousObservable]) -> Union[ExecutionResult, AnonymousObservable]
+        # type: (Union[None, OrderedDict, Observable]) -> Union[ExecutionResult, Observable]
         if isinstance(data, Observable):
             return data
 
@@ -260,7 +260,7 @@ def subscribe_fields(
     source_value,  # type: Union[None, Data, type]
     fields,  # type: DefaultOrderedDict
 ):
-    # type: (...) -> AnonymousObservable
+    # type: (...) -> Observable
     exe_context = SubscriberExecutionContext(exe_context)
 
     def on_error(error):
@@ -364,7 +364,7 @@ def subscribe_field(
     field_asts,  # type: List[Field]
     path,  # type: List[str]
 ):
-    # type: (...) -> AnonymousObservable
+    # type: (...) -> Observable
     field_ast = field_asts[0]
     field_name = field_ast.name.value
 

graphql/execution/tests/test_subscribe.py

@@ -17,7 +17,7 @@
 
 if False:
     from graphql.execution.base import ResolveInfo
-    from rx.core.anonymousobservable import AnonymousObservable
+    from rx import Observable
     from typing import Optional, Union, Any, Callable, Tuple
     from graphql.execution.base import ExecutionResult
 
@@ -84,7 +84,7 @@ def get_unbound_function(func):
 def email_schema_with_resolvers(resolve_fn=None):
     # type: (Callable) -> GraphQLSchema
     def default_resolver(root, info):
-        # type: (Any, ResolveInfo) -> Union[AnonymousObservable, Subject]
+        # type: (Any, ResolveInfo) -> Union[Observable, Subject]
         func = getattr(root, "importantEmail", None)
         if func:
             func = get_unbound_function(func)
@@ -129,7 +129,7 @@ def create_subscription(
     ast=None,  # type: Optional[Any]
     vars=None,  # type: Optional[Any]
 ):
-    # type: (...) -> Tuple[Callable, Union[ExecutionResult, AnonymousObservable]]
+    # type: (...) -> Tuple[Callable, Union[ExecutionResult, Observable]]
     class Root(object):
         class inbox(object):
             emails = [

graphql/graphql.py

@@ -4,7 +4,7 @@
 from promise import promisify
 
 if False:
-    from rx.core.anonymousobservable import AnonymousObservable
+    from rx import Observable
     from typing import Any, Union, Optional
     from .language.ast import Document
     from .type.schema import GraphQLSchema
@@ -34,7 +34,7 @@
 
 
 def graphql(*args, **kwargs):
-    # type: (*Any, **Any) -> Union[ExecutionResult, AnonymousObservable]
+    # type: (*Any, **Any) -> Union[ExecutionResult, Observable]
     return_promise = kwargs.get("return_promise", False)
     if return_promise:
         return execute_graphql_as_promise(*args, **kwargs)
@@ -53,7 +53,7 @@ def execute_graphql(
     backend=None,  # type: Optional[Any]
     **execute_options  # type: Any
 ):
-    # type: (...) -> Union[ExecutionResult, AnonymousObservable]
+    # type: (...) -> Union[ExecutionResult, Observable]
     try:
         if backend is None:
             backend = get_default_backend()