More modernization of typing annotations in tests

Author: Cito

tests/error/test_graphql_error.py

@@ -1,4 +1,6 @@
-from typing import List, Union, cast
+from __future__ import annotations
+
+from typing import cast
 
 from graphql.error import GraphQLError
 from graphql.language import (
@@ -204,7 +206,7 @@ def serializes_to_include_message_and_locations():
         }
 
     def serializes_to_include_path():
-        path: List[Union[int, str]] = ["path", 3, "to", "field"]
+        path: list[int | str] = ["path", 3, "to", "field"]
         e = GraphQLError("msg", path=path)
         assert e.path is path
         assert repr(e) == "GraphQLError('msg', path=['path', 3, 'to', 'field'])"
@@ -218,7 +220,7 @@ def serializes_to_include_all_standard_fields():
         assert str(e_short) == "msg"
         assert repr(e_short) == "GraphQLError('msg')"
 
-        path: List[Union[str, int]] = ["path", 2, "field"]
+        path: list[str | int] = ["path", 2, "field"]
         extensions = {"foo": "bar "}
         e_full = GraphQLError("msg", field_node, None, None, path, None, extensions)
         assert str(e_full) == (
@@ -240,7 +242,7 @@ def repr_includes_extensions():
         assert repr(e) == "GraphQLError('msg', extensions={'foo': 'bar'})"
 
     def always_stores_path_as_list():
-        path: List[Union[int, str]] = ["path", 3, "to", "field"]
+        path: list[int | str] = ["path", 3, "to", "field"]
         e = GraphQLError("msg,", path=tuple(path))
         assert isinstance(e.path, list)
         assert e.path == path
@@ -346,7 +348,7 @@ def prints_an_error_with_nodes_from_different_sources():
 
 def describe_formatted():
     def formats_graphql_error():
-        path: List[Union[int, str]] = ["one", 2]
+        path: list[int | str] = ["one", 2]
         extensions = {"ext": None}
         error = GraphQLError(
             "test message",
@@ -379,7 +381,7 @@ def uses_default_message():
         }
 
     def includes_path():
-        path: List[Union[int, str]] = ["path", 3, "to", "field"]
+        path: list[int | str] = ["path", 3, "to", "field"]
         error = GraphQLError("msg", path=path)
         assert error.formatted == {"message": "msg", "path": path}
 

tests/execution/test_abstract.py

@@ -1,4 +1,6 @@
-from typing import Any, NamedTuple, Optional
+from __future__ import annotations
+
+from typing import Any, NamedTuple
 
 import pytest
 from graphql.execution import ExecutionResult, execute, execute_sync
@@ -448,19 +450,19 @@ class RootValueAsObject:
 
                 class Pet:
                     __typename = "Pet"
-                    name: Optional[str] = None
+                    name: str | None = None
 
                 class DogPet(Pet):
                     __typename = "Dog"
-                    woofs: Optional[bool] = None
+                    woofs: bool | None = None
 
                 class Odie(DogPet):
                     name = "Odie"
                     woofs = True
 
                 class CatPet(Pet):
                     __typename = "Cat"
-                    meows: Optional[bool] = None
+                    meows: bool | None = None
 
                 class Tabby(CatPet):
                     pass

tests/execution/test_defer.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 from asyncio import sleep
-from typing import Any, AsyncGenerator, Dict, List, NamedTuple
+from typing import Any, AsyncGenerator, NamedTuple
 
 import pytest
 from graphql.error import GraphQLError
@@ -111,7 +113,7 @@ async def complete(document: DocumentNode, root_value: Any = None) -> Any:
         result = await result
 
     if isinstance(result, ExperimentalIncrementalExecutionResults):
-        results: List[Any] = [result.initial_result.formatted]
+        results: list[Any] = [result.initial_result.formatted]
         async for patch in result.subsequent_results:
             results.append(patch.formatted)
         return results
@@ -120,7 +122,7 @@ async def complete(document: DocumentNode, root_value: Any = None) -> Any:
     return result.formatted
 
 
-def modified_args(args: Dict[str, Any], **modifications: Any) -> Dict[str, Any]:
+def modified_args(args: dict[str, Any], **modifications: Any) -> dict[str, Any]:
     return {**args, **modifications}
 
 
@@ -152,7 +154,7 @@ def can_format_and_print_incremental_defer_result():
 
     # noinspection PyTypeChecker
     def can_compare_incremental_defer_result():
-        args: Dict[str, Any] = {
+        args: dict[str, Any] = {
             "data": {"hello": "world"},
             "errors": [GraphQLError("msg")],
             "path": ["foo", 1],
@@ -219,7 +221,7 @@ def can_format_and_print_initial_incremental_execution_result():
 
     def can_compare_initial_incremental_execution_result():
         incremental = [IncrementalDeferResult(label="foo")]
-        args: Dict[str, Any] = {
+        args: dict[str, Any] = {
             "data": {"hello": "world"},
             "errors": [GraphQLError("msg")],
             "incremental": incremental,
@@ -298,7 +300,7 @@ def can_format_and_print_subsequent_incremental_execution_result():
 
     def can_compare_subsequent_incremental_execution_result():
         incremental = [IncrementalDeferResult(label="foo")]
-        args: Dict[str, Any] = {
+        args: dict[str, Any] = {
             "incremental": incremental,
             "has_next": True,
             "extensions": {"baz": 2},

tests/execution/test_executor.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 import asyncio
-from typing import Any, Awaitable, Optional, cast
+from typing import Any, Awaitable, cast
 
 import pytest
 from graphql.error import GraphQLError
@@ -263,7 +265,7 @@ def resolve(_obj, info):
         )
 
     def it_populates_path_correctly_with_complex_types():
-        path: Optional[ResponsePath] = None
+        path: ResponsePath | None = None
 
         def resolve(_val, info):
             nonlocal path

tests/execution/test_mutations.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 from asyncio import sleep
-from typing import Any, Awaitable, List
+from typing import Any, Awaitable
 
 import pytest
 from graphql.execution import (
@@ -232,7 +234,7 @@ async def mutation_fields_with_defer_do_not_block_next_mutation():
             schema, document, root_value
         )
 
-        patches: List[Any] = []
+        patches: list[Any] = []
         assert isinstance(mutation_result, ExperimentalIncrementalExecutionResults)
         patches.append(mutation_result.initial_result.formatted)
         async for patch in mutation_result.subsequent_results:
@@ -303,7 +305,7 @@ async def mutation_with_defer_is_not_executed_serially():
             schema, document, root_value
         )
 
-        patches: List[Any] = []
+        patches: list[Any] = []
         assert isinstance(mutation_result, ExperimentalIncrementalExecutionResults)
         patches.append(mutation_result.initial_result.formatted)
         async for patch in mutation_result.subsequent_results:

tests/execution/test_stream.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 from asyncio import Event, Lock, gather, sleep
-from typing import Any, Awaitable, Dict, List, NamedTuple
+from typing import Any, Awaitable, NamedTuple
 
 import pytest
 from graphql.error import GraphQLError
@@ -91,7 +93,7 @@ async def complete(document: DocumentNode, root_value: Any = None) -> Any:
         result = await result
 
     if isinstance(result, ExperimentalIncrementalExecutionResults):
-        results: List[Any] = [result.initial_result.formatted]
+        results: list[Any] = [result.initial_result.formatted]
         async for patch in result.subsequent_results:
             results.append(patch.formatted)
         return results
@@ -140,7 +142,7 @@ async def locked_next():
     return [IteratorResult(result).formatted for result in results]
 
 
-def modified_args(args: Dict[str, Any], **modifications: Any) -> Dict[str, Any]:
+def modified_args(args: dict[str, Any], **modifications: Any) -> dict[str, Any]:
     return {**args, **modifications}
 
 
@@ -187,7 +189,7 @@ def can_print_stream_record():
 
     # noinspection PyTypeChecker
     def can_compare_incremental_stream_result():
-        args: Dict[str, Any] = {
+        args: dict[str, Any] = {
             "items": ["hello", "world"],
             "errors": [GraphQLError("msg")],
             "path": ["foo", 1],

tests/execution/test_variables.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 from math import nan
-from typing import Any, Dict, Optional
+from typing import Any
 
 from graphql.error import GraphQLError
 from graphql.execution import ExecutionResult, execute_sync
@@ -153,7 +155,7 @@ def field_with_input_arg(input_arg: GraphQLArgument):
 
 
 def execute_query(
-    query: str, variable_values: Optional[Dict[str, Any]] = None
+    query: str, variable_values: dict[str, Any] | None = None
 ) -> ExecutionResult:
     document = parse(query)
     return execute_sync(schema, document, variable_values=variable_values)
@@ -1039,7 +1041,7 @@ def describe_get_variable_values_limit_maximum_number_of_coercion_errors():
 
         input_value = {"input": [0, 1, 2]}
 
-        def _invalid_value_error(value: int, index: int) -> Dict[str, Any]:
+        def _invalid_value_error(value: int, index: int) -> dict[str, Any]:
             return {
                 "message": "Variable '$input' got invalid value"
                 f" {value} at 'input[{index}]';"

tests/language/test_ast.py

@@ -1,6 +1,7 @@
+from __future__ import annotations
+
 import weakref
 from copy import copy, deepcopy
-from typing import Optional
 
 from graphql.language import Location, NameNode, Node, Source, Token, TokenKind
 from graphql.pyutils import inspect
@@ -17,7 +18,7 @@ class SampleNamedNode(Node):
     __slots__ = "foo", "name"
 
     foo: str
-    name: Optional[str]
+    name: str | None
 
 
 def describe_token_class():

tests/language/test_block_string.py

@@ -1,4 +1,6 @@
-from typing import Collection, Optional, cast
+from __future__ import annotations
+
+from typing import Collection, cast
 
 from graphql.language.block_string import (
     dedent_block_string_lines,
@@ -152,7 +154,7 @@ def __str__(self) -> str:
 
 def describe_print_block_string():
     def _assert_block_string(
-        s: str, readable: str, minimize: Optional[str] = None
+        s: str, readable: str, minimize: str | None = None
     ) -> None:
         assert print_block_string(s) == readable
         assert print_block_string(s, minimize=True) == minimize or readable

tests/language/test_lexer.py

@@ -1,4 +1,6 @@
-from typing import List, Optional, Tuple
+from __future__ import annotations
+
+from typing import Optional, Tuple
 
 import pytest
 from graphql.error import GraphQLSyntaxError
@@ -576,8 +578,8 @@ def produces_double_linked_list_of_tokens_including_comments():
             assert end_token.kind != TokenKind.COMMENT
         assert start_token.prev is None
         assert end_token.next is None
-        tokens: List[Token] = []
-        tok: Optional[Token] = start_token
+        tokens: list[Token] = []
+        tok: Token | None = start_token
         while tok:
             assert not tokens or tok.prev == tokens[-1]
             tokens.append(tok)