Use some more postponed evaluation of annotations

Author: Cito

docs/conf.py

@@ -120,9 +120,12 @@
 # We need to give autodoc a little help in this cases, too:
 graphql_classes = {
     'GraphQLAbstractType': 'type',
+    'GraphQLFieldResolver': 'type',
     'GraphQLObjectType': 'type',
     'GraphQLOutputType': 'type',
     'GraphQLTypeResolver': 'type',
+    'AwaitableOrValue': 'execution',
+    'Middleware': 'execution',
     'Node': 'language',
     'Source': 'language',
     'SourceLocation': 'language'
@@ -135,13 +138,18 @@
 traceback
 types.TracebackType
 TypeMap
+AwaitableOrValue
 EnterLeaveVisitor
 FormattedSourceLocation
 GraphQLAbstractType
 GraphQLErrorExtensions
+GraphQLFieldResolver
+GraphQLTypeResolver
 GraphQLOutputType
+Middleware
 asyncio.events.AbstractEventLoop
 graphql.execution.map_async_iterator.MapAsyncIterator
+graphql.execution.Middleware
 graphql.language.lexer.EscapeSequence
 graphql.language.visitor.EnterLeaveVisitor
 graphql.type.schema.InterfaceImplementations

src/graphql/error/graphql_error.py

@@ -149,7 +149,7 @@ def __init__(
             positions = [loc.start for loc in node_locations]
         self.positions = positions or None
         if positions and source:
-            locations: Optional[List["SourceLocation"]] = [
+            locations: Optional[List[SourceLocation]] = [
                 source.get_location(pos) for pos in positions
             ]
         else:

src/graphql/error/located_error.py

@@ -12,7 +12,7 @@
 
 def located_error(
     original_error: Exception,
-    nodes: Optional[Union["None", Collection["Node"]]] = None,
+    nodes: Optional[Union[None, Collection["Node"]]] = None,
     path: Optional[Collection[Union[str, int]]] = None,
 ) -> GraphQLError:
     """Located GraphQL Error

src/graphql/error/syntax_error.py

@@ -14,7 +14,7 @@
 class GraphQLSyntaxError(GraphQLError):
     """A GraphQLError representing a syntax error."""
 
-    def __init__(self, source: Source, position: int, description: str) -> None:
+    def __init__(self, source: "Source", position: int, description: str) -> None:
         super().__init__(
             f"Syntax Error: {description}", source=source, positions=[position]
         )

src/graphql/execution/execute.py

@@ -1,3 +1,5 @@
+from __future__ import annotations  # Python < 3.10
+
 from asyncio import ensure_future, gather
 from collections.abc import Mapping
 from inspect import isawaitable
@@ -238,7 +240,7 @@ def build(
         subscribe_field_resolver: Optional[GraphQLFieldResolver] = None,
         middleware: Optional[Middleware] = None,
         is_awaitable: Optional[Callable[[Any], bool]] = None,
-    ) -> Union[List[GraphQLError], "ExecutionContext"]:
+    ) -> Union[List[GraphQLError], ExecutionContext]:
         """Build an execution context
 
         Constructs a ExecutionContext object from the arguments passed to execute, which
@@ -972,7 +974,7 @@ def execute(
     type_resolver: Optional[GraphQLTypeResolver] = None,
     subscribe_field_resolver: Optional[GraphQLFieldResolver] = None,
     middleware: Optional[Middleware] = None,
-    execution_context_class: Optional[Type["ExecutionContext"]] = None,
+    execution_context_class: Optional[Type[ExecutionContext]] = None,
     is_awaitable: Optional[Callable[[Any], bool]] = None,
 ) -> AwaitableOrValue[ExecutionResult]:
     """Execute a GraphQL operation.
@@ -1060,7 +1062,7 @@ def execute_sync(
     field_resolver: Optional[GraphQLFieldResolver] = None,
     type_resolver: Optional[GraphQLTypeResolver] = None,
     middleware: Optional[Middleware] = None,
-    execution_context_class: Optional[Type["ExecutionContext"]] = None,
+    execution_context_class: Optional[Type[ExecutionContext]] = None,
     check_sync: bool = False,
 ) -> ExecutionResult:
     """Execute a GraphQL operation synchronously.

src/graphql/execution/subscribe.py

@@ -29,7 +29,7 @@ async def subscribe(
     operation_name: Optional[str] = None,
     field_resolver: Optional[GraphQLFieldResolver] = None,
     subscribe_field_resolver: Optional[GraphQLFieldResolver] = None,
-    execution_context_class: Optional[Type["ExecutionContext"]] = None,
+    execution_context_class: Optional[Type[ExecutionContext]] = None,
 ) -> Union[AsyncIterator[ExecutionResult], ExecutionResult]:
     """Create a GraphQL subscription.
 
@@ -97,7 +97,7 @@ async def create_source_event_stream(
     variable_values: Optional[Dict[str, Any]] = None,
     operation_name: Optional[str] = None,
     subscribe_field_resolver: Optional[GraphQLFieldResolver] = None,
-    execution_context_class: Optional[Type["ExecutionContext"]] = None,
+    execution_context_class: Optional[Type[ExecutionContext]] = None,
 ) -> Union[AsyncIterable[Any], ExecutionResult]:
     """Create source event stream
 

src/graphql/language/ast.py

@@ -93,8 +93,8 @@ class Token:
     value: Optional[str]
     # Tokens exist as nodes in a double-linked-list amongst all tokens including
     # ignored tokens. <SOF> is always the first node and <EOF> the last.
-    prev: Optional["Token"]
-    next: Optional["Token"]
+    prev: Optional[Token]
+    next: Optional[Token]
 
     def __init__(
         self,
@@ -413,7 +413,7 @@ class NameNode(Node):
 class DocumentNode(Node):
     __slots__ = ("definitions",)
 
-    definitions: Tuple["DefinitionNode", ...]
+    definitions: Tuple[DefinitionNode, ...]
 
 
 class DefinitionNode(Node):
@@ -424,9 +424,9 @@ class ExecutableDefinitionNode(DefinitionNode):
     __slots__ = "name", "directives", "variable_definitions", "selection_set"
 
     name: Optional[NameNode]
-    directives: Tuple["DirectiveNode", ...]
-    variable_definitions: Tuple["VariableDefinitionNode", ...]
-    selection_set: "SelectionSetNode"
+    directives: Tuple[DirectiveNode, ...]
+    variable_definitions: Tuple[VariableDefinitionNode, ...]
+    selection_set: SelectionSetNode
 
 
 class OperationDefinitionNode(ExecutableDefinitionNode):
@@ -438,43 +438,43 @@ class OperationDefinitionNode(ExecutableDefinitionNode):
 class VariableDefinitionNode(Node):
     __slots__ = "variable", "type", "default_value", "directives"
 
-    variable: "VariableNode"
-    type: "TypeNode"
-    default_value: Optional["ConstValueNode"]
-    directives: Tuple["ConstDirectiveNode", ...]
+    variable: VariableNode
+    type: TypeNode
+    default_value: Optional[ConstValueNode]
+    directives: Tuple[ConstDirectiveNode, ...]
 
 
 class SelectionSetNode(Node):
     __slots__ = ("selections",)
 
-    selections: Tuple["SelectionNode", ...]
+    selections: Tuple[SelectionNode, ...]
 
 
 class SelectionNode(Node):
     __slots__ = ("directives",)
 
-    directives: Tuple["DirectiveNode", ...]
+    directives: Tuple[DirectiveNode, ...]
 
 
 class FieldNode(SelectionNode):
     __slots__ = "alias", "name", "arguments", "selection_set"
 
     alias: Optional[NameNode]
     name: NameNode
-    arguments: Tuple["ArgumentNode", ...]
+    arguments: Tuple[ArgumentNode, ...]
     selection_set: Optional[SelectionSetNode]
 
 
 class ArgumentNode(Node):
     __slots__ = "name", "value"
 
     name: NameNode
-    value: "ValueNode"
+    value: ValueNode
 
 
 class ConstArgumentNode(ArgumentNode):
 
-    value: "ConstValueNode"
+    value: ConstValueNode
 
 
 # Fragments
@@ -489,15 +489,15 @@ class FragmentSpreadNode(SelectionNode):
 class InlineFragmentNode(SelectionNode):
     __slots__ = "type_condition", "selection_set"
 
-    type_condition: "NamedTypeNode"
+    type_condition: NamedTypeNode
     selection_set: SelectionSetNode
 
 
 class FragmentDefinitionNode(ExecutableDefinitionNode):
     __slots__ = ("type_condition",)
 
     name: NameNode
-    type_condition: "NamedTypeNode"
+    type_condition: NamedTypeNode
 
 
 # Values
@@ -556,18 +556,18 @@ class ListValueNode(ValueNode):
 
 class ConstListValueNode(ListValueNode):
 
-    values: Tuple["ConstValueNode", ...]
+    values: Tuple[ConstValueNode, ...]
 
 
 class ObjectValueNode(ValueNode):
     __slots__ = ("fields",)
 
-    fields: Tuple["ObjectFieldNode", ...]
+    fields: Tuple[ObjectFieldNode, ...]
 
 
 class ConstObjectValueNode(ObjectValueNode):
 
-    fields: Tuple["ConstObjectFieldNode", ...]
+    fields: Tuple[ConstObjectFieldNode, ...]
 
 
 class ObjectFieldNode(Node):
@@ -579,7 +579,7 @@ class ObjectFieldNode(Node):
 
 class ConstObjectFieldNode(ObjectFieldNode):
 
-    value: "ConstValueNode"
+    value: ConstValueNode
 
 
 ConstValueNode = Union[
@@ -646,7 +646,7 @@ class SchemaDefinitionNode(TypeSystemDefinitionNode):
 
     description: Optional[StringValueNode]
     directives: Tuple[ConstDirectiveNode, ...]
-    operation_types: Tuple["OperationTypeDefinitionNode", ...]
+    operation_types: Tuple[OperationTypeDefinitionNode, ...]
 
 
 class OperationTypeDefinitionNode(Node):
@@ -678,7 +678,7 @@ class ObjectTypeDefinitionNode(TypeDefinitionNode):
 
     interfaces: Tuple[NamedTypeNode, ...]
     directives: Tuple[ConstDirectiveNode, ...]
-    fields: Tuple["FieldDefinitionNode", ...]
+    fields: Tuple[FieldDefinitionNode, ...]
 
 
 class FieldDefinitionNode(DefinitionNode):
@@ -687,7 +687,7 @@ class FieldDefinitionNode(DefinitionNode):
     description: Optional[StringValueNode]
     name: NameNode
     directives: Tuple[ConstDirectiveNode, ...]
-    arguments: Tuple["InputValueDefinitionNode", ...]
+    arguments: Tuple[InputValueDefinitionNode, ...]
     type: TypeNode
 
 
@@ -704,7 +704,7 @@ class InputValueDefinitionNode(DefinitionNode):
 class InterfaceTypeDefinitionNode(TypeDefinitionNode):
     __slots__ = "fields", "interfaces"
 
-    fields: Tuple["FieldDefinitionNode", ...]
+    fields: Tuple[FieldDefinitionNode, ...]
     directives: Tuple[ConstDirectiveNode, ...]
     interfaces: Tuple[NamedTypeNode, ...]
 
@@ -720,7 +720,7 @@ class EnumTypeDefinitionNode(TypeDefinitionNode):
     __slots__ = ("values",)
 
     directives: Tuple[ConstDirectiveNode, ...]
-    values: Tuple["EnumValueDefinitionNode", ...]
+    values: Tuple[EnumValueDefinitionNode, ...]
 
 
 class EnumValueDefinitionNode(DefinitionNode):

src/graphql/language/location.py

@@ -40,7 +40,7 @@ def __ne__(self, other: Any) -> bool:
         return not self == other
 
 
-def get_location(source: Source, position: int) -> SourceLocation:
+def get_location(source: "Source", position: int) -> SourceLocation:
     """Get the line and column for a character position in the source.
 
     Takes a Source and a UTF-8 character offset, and returns the corresponding line and

src/graphql/pyutils/undefined.py

@@ -1,3 +1,5 @@
+from __future__ import annotations  # Python < 3.10
+
 import warnings
 from typing import Any, Optional
 
@@ -8,9 +10,9 @@
 class UndefinedType(ValueError):
     """Auxiliary class for creating the Undefined singleton."""
 
-    _instance: Optional["UndefinedType"] = None
+    _instance: Optional[UndefinedType] = None
 
-    def __new__(cls) -> "UndefinedType":
+    def __new__(cls) -> UndefinedType:
         if cls._instance is None:
             cls._instance = super().__new__(cls)
         else: