Remove special casing for older Python versions

Author: Cito

pyproject.toml

@@ -40,11 +40,12 @@ test = [
 ]
 lint = [
     "ruff>=0.14,<0.15",
-    "mypy>=1.10,<2",
+    "mypy>=1.19,<2",
     "bump2version>=1,<2",
+    "typing-extensions>=4.7; python_version<'3.11'",
 ]
 doc = [
-    "sphinx>=9,<10",
+    "sphinx>=9.1,<10",
     "sphinx_rtd_theme>=3.1.0rc2,<4",
 ]
 
@@ -73,7 +74,7 @@ source-exclude = [
 
 [tool.ruff]
 line-length = 88
-target-version = "py37"
+target-version = "py310"
 
 [tool.ruff.lint]
 select = [
@@ -118,7 +119,8 @@ select = [
   "TCH",    # flake8-type-checking
   "TID",    # flake8-tidy-imports
   "TRY",    # tryceratops
-  "UP",     # pyupgrade
+  # TODO: enable again after upgradesc
+  #"UP",     # pyupgrade
   "W",      # pycodestyle
   "YTT",    # flake8-2020
 ]

src/graphql/error/graphql_error.py

@@ -3,16 +3,7 @@
 from __future__ import annotations
 
 from sys import exc_info
-from typing import TYPE_CHECKING, Any, Collection, Dict
-
-try:
-    from typing import TypedDict
-except ImportError:  # Python < 3.8
-    from typing_extensions import TypedDict
-try:
-    from typing import TypeAlias
-except ImportError:  # Python < 3.10
-    from typing_extensions import TypeAlias
+from typing import TYPE_CHECKING, Any, Collection, Dict, TypeAlias, TypedDict
 
 if TYPE_CHECKING:
     from ..language.ast import Node

src/graphql/execution/build_field_plan.py

@@ -2,16 +2,11 @@
 
 from __future__ import annotations
 
-from typing import NamedTuple
+from typing import NamedTuple, TypeAlias
 
 from ..pyutils import RefMap, RefSet
 from .collect_fields import DeferUsage, FieldGroup, GroupedFieldSet
 
-try:
-    from typing import TypeAlias
-except ImportError:  # Python < 3.10
-    from typing_extensions import TypeAlias
-
 __all__ = [
     "DeferUsageSet",
     "FieldPlan",

src/graphql/execution/collect_fields.py

@@ -2,9 +2,8 @@
 
 from __future__ import annotations
 
-import sys
 from collections import defaultdict
-from typing import Any, NamedTuple
+from typing import Any, NamedTuple, TypeAlias
 
 from ..language import (
     FieldNode,
@@ -26,11 +25,6 @@
 from ..utilities.type_from_ast import type_from_ast
 from .values import get_directive_values
 
-try:
-    from typing import TypeAlias
-except ImportError:  # Python < 3.10
-    from typing_extensions import TypeAlias
-
 __all__ = [
     "CollectFieldsContext",
     "CollectedFields",
@@ -67,14 +61,8 @@ class FieldDetails(NamedTuple):
     defer_usage: DeferUsage | None
 
 
-if sys.version_info < (3, 9):
-    from typing import Dict, List
-
-    FieldGroup: TypeAlias = List[FieldDetails]
-    GroupedFieldSet: TypeAlias = Dict[str, FieldGroup]
-else:  # Python >= 3.9
-    FieldGroup: TypeAlias = list[FieldDetails]
-    GroupedFieldSet: TypeAlias = dict[str, FieldGroup]
+FieldGroup: TypeAlias = list[FieldDetails]
+GroupedFieldSet: TypeAlias = dict[str, FieldGroup]
 
 
 class CollectFieldsContext(NamedTuple):

src/graphql/execution/execute.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from asyncio import (
-    CancelledError,
     TimeoutError,  # only needed for Python < 3.11  # noqa: A004
     ensure_future,
     sleep,
@@ -108,21 +107,9 @@
 from .values import get_argument_values, get_directive_values, get_variable_values
 
 if TYPE_CHECKING:
-    from ..pyutils import UndefinedType
-
-    try:
-        from typing import TypeAlias, TypeGuard
-    except ImportError:  # Python < 3.10
-        from typing_extensions import TypeAlias, TypeGuard
-
-try:  # pragma: no cover
-    anext  # noqa: B018  # pyright: ignore
-except NameError:  # pragma: no cover (Python < 3.10)
-
-    async def anext(iterator: AsyncIterator) -> Any:
-        """Return the next item from an async iterator."""
-        return await iterator.__anext__()
+    from typing import TypeAlias, TypeGuard
 
+    from ..pyutils import UndefinedType
 
 __all__ = [
     "ExecutionContext",
@@ -577,7 +564,7 @@ async def get_results() -> GraphQLWrappedResult[dict[str, Any]]:
                 awaited_results = await gather_with_cancel(
                     *(results[field] for field in awaitable_fields)
                 )
-                results.update(zip(awaitable_fields, awaited_results))
+                results.update(zip(awaitable_fields, awaited_results, strict=True))
 
             return GraphQLWrappedResult(results, graphql_wrapped_result.increments)
 
@@ -654,10 +641,6 @@ async def await_completed() -> Any:
                     try:
                         return await completed
                     except Exception as raw_error:
-                        # Before Python 3.8 CancelledError inherits Exception and
-                        # so gets caught here.
-                        if isinstance(raw_error, CancelledError):
-                            raise  # pragma: no cover
                         self.handle_field_error(
                             raw_error,
                             return_type,
@@ -867,10 +850,6 @@ async def complete_awaitable_value(
             if self.is_awaitable(completed):
                 completed = await completed
         except Exception as raw_error:
-            # Before Python 3.8 CancelledError inherits Exception and
-            # so gets caught here.
-            if isinstance(raw_error, CancelledError):
-                raise  # pragma: no cover
             self.handle_field_error(
                 raw_error, return_type, field_group, path, incremental_context
             )
@@ -1040,7 +1019,9 @@ async def complete_async_iterator_value(
             awaited_results = await gather_with_cancel(
                 *(completed_results[index] for index in awaitable_indices)
             )
-            for index, sub_result in zip(awaitable_indices, awaited_results):
+            for index, sub_result in zip(
+                awaitable_indices, awaited_results, strict=True
+            ):
                 completed_results[index] = sub_result
         return GraphQLWrappedResult(
             completed_results, graphql_wrapped_result.increments
@@ -1186,7 +1167,9 @@ async def get_completed_results() -> GraphQLWrappedResult[list[Any]]:
                 awaited_results = await gather_with_cancel(
                     *(completed_results[index] for index in awaitable_indices)
                 )
-                for index, sub_result in zip(awaitable_indices, awaited_results):
+                for index, sub_result in zip(
+                    awaitable_indices, awaited_results, strict=True
+                ):
                     completed_results[index] = sub_result
             return GraphQLWrappedResult(
                 completed_results, graphql_wrapped_result.increments
@@ -2449,7 +2432,9 @@ def default_type_resolver(
 
         async def get_type() -> str | None:
             is_type_of_results = await gather_with_cancel(*awaitable_is_type_of_results)
-            for is_type_of_result, type_ in zip(is_type_of_results, awaitable_types):
+            for is_type_of_result, type_ in zip(
+                is_type_of_results, awaitable_types, strict=True
+            ):
                 if is_type_of_result:
                     return type_.name
             return None

src/graphql/execution/incremental_graph.py

@@ -33,6 +33,8 @@
 )
 
 if TYPE_CHECKING:
+    from typing import TypeGuard
+
     from ..error.graphql_error import GraphQLError
     from .types import (
         DeferredFragmentRecord,
@@ -43,11 +45,6 @@
         SubsequentResultRecord,
     )
 
-    try:
-        from typing import TypeGuard
-    except ImportError:  # Python < 3.10
-        from typing_extensions import TypeGuard
-
 __all__ = ["IncrementalGraph"]
 
 

src/graphql/execution/incremental_publisher.py

@@ -9,6 +9,7 @@
     Any,
     AsyncGenerator,
     NamedTuple,
+    Protocol,
     Sequence,
     cast,
 )
@@ -27,11 +28,6 @@
     is_non_reconcilable_deferred_grouped_field_set_result,
 )
 
-try:
-    from typing import Protocol
-except ImportError:  # Python < 3.8
-    from typing_extensions import Protocol
-
 if TYPE_CHECKING:
     from ..error import GraphQLError
     from .types import (

src/graphql/execution/middleware.py

@@ -4,13 +4,7 @@
 
 from functools import partial, reduce
 from inspect import isfunction
-from typing import Any, Callable, Iterator
-
-try:
-    from typing import TypeAlias
-except ImportError:  # Python < 3.10
-    from typing_extensions import TypeAlias
-
+from typing import Any, Callable, Iterator, TypeAlias
 
 __all__ = ["MiddlewareManager"]
 

src/graphql/execution/types.py

@@ -10,29 +10,20 @@
     Callable,
     Iterator,
     NamedTuple,
+    TypeAlias,
+    TypedDict,
     TypeVar,
     Union,
 )
 
-try:
-    from typing import TypedDict
-except ImportError:  # Python < 3.8
-    from typing_extensions import TypedDict
-try:
-    from typing import TypeAlias
-except ImportError:  # Python < 3.10
-    from typing_extensions import TypeAlias
-
 from ..pyutils import BoxedAwaitableOrValue, Undefined
 
 if TYPE_CHECKING:
+    from typing import TypeGuard
+
     from ..error import GraphQLError, GraphQLFormattedError
     from ..pyutils import Path
 
-    try:
-        from typing import TypeGuard
-    except ImportError:  # Python < 3.10
-        from typing_extensions import TypeGuard
     try:
         from typing import NotRequired
     except ImportError:  # Python < 3.11
@@ -779,10 +770,8 @@ def is_deferred_grouped_field_set_result(
     """Check if the subsequent result is a deferred grouped field set result."""
     return isinstance(
         subsequent_result,
-        (
-            ReconcilableDeferredGroupedFieldSetResult,
-            NonReconcilableDeferredGroupedFieldSetResult,
-        ),  # we could use the union type here in Python >= 3.10
+        ReconcilableDeferredGroupedFieldSetResult
+        | NonReconcilableDeferredGroupedFieldSetResult,
     )
 
 

src/graphql/execution/values.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable, Collection, Dict, List, Union
+from typing import Any, Callable, Collection, Dict, List, TypeAlias, Union
 
 from ..error import GraphQLError
 from ..language import (
@@ -34,11 +34,6 @@
 from ..utilities.type_from_ast import type_from_ast
 from ..utilities.value_from_ast import value_from_ast
 
-try:
-    from typing import TypeAlias
-except ImportError:  # Python < 3.10
-    from typing_extensions import TypeAlias
-
 __all__ = ["get_argument_values", "get_directive_values", "get_variable_values"]
 
 CoercedVariableValues: TypeAlias = Union[List[GraphQLError], Dict[str, Any]]