Modernize code to make ruff happy

Author: Cito

docs/conf.py

@@ -116,22 +116,10 @@
     "validation": ["rules", "validation_context"],
 }
 
-# be nitpicky (handle all possible problems in on_missing_reference)
+# be nitpicky
 nitpicky = True
-nitpick_ignore = [
-    # TypeVars and internal types that can't be resolved
-    ("py:obj", "graphql.pyutils.ref_map.K"),
-    ("py:obj", "graphql.pyutils.ref_map.V"),
-    ("py:obj", "graphql.pyutils.awaitable_or_value.T"),
-    ("py:obj", "graphql.pyutils.boxed_awaitable_or_value.T"),
-    ("py:obj", "graphql.pyutils.ref_set.T"),
-    ("py:obj", "graphql.type.definition.T"),
-    ("py:obj", "graphql.type.definition.GT_co"),
-    ("py:obj", "graphql.type.definition.GNT_co"),
-    ("py:obj", "graphql.type.definition.TContext"),
-]
-
-suppress_warnings = ["ref.class", "ref.python"]
+# but not too nitpicky
+suppress_warnings = ["ref.class", "ref.obj", "ref.python"]
 
 
 # The reST default role (used for this markup: `text`) to use for all

pyproject.toml

@@ -81,6 +81,7 @@ select = [
   "A",      # flake8-builtins
   "ANN",    # flake8-annotations
   "ARG",    # flake8-unused-arguments
+  "ASYNC",  # flake8-async
   "B",      # flake8-bugbear
   "BLE",    # flake8-blind-except
   "C4",     # flake8-comprehensions
@@ -101,6 +102,7 @@ select = [
   "INT",    # flake8-gettext
   "ISC",    # flake8-implicit-str-concat
   "N",      # pep8-naming
+  "PERF",   # perflint
   "PGH",    # pygrep-hooks
   "PIE",    # flake8-pie
   "PL",     # Pylint
@@ -110,6 +112,7 @@ select = [
   "Q",      # flake8-quotes
   "RET",    # flake8-return
   "RSE",    # flake8-raise
+  "FURB",   # refurb
   "RUF",    # Ruff-specific rules
   "S",      # flake8-bandit
   "SLF",    # flake8-self
@@ -119,8 +122,7 @@ select = [
   "TCH",    # flake8-type-checking
   "TID",    # flake8-tidy-imports
   "TRY",    # tryceratops
-  # TODO: enable again after upgradesc
-  #"UP",     # pyupgrade
+  "UP",     # pyupgrade
   "W",      # pycodestyle
   "YTT",    # flake8-2020
 ]

src/graphql/error/graphql_error.py

@@ -3,9 +3,11 @@
 from __future__ import annotations
 
 from sys import exc_info
-from typing import TYPE_CHECKING, Any, Collection, Dict, TypeAlias, TypedDict
+from typing import TYPE_CHECKING, Any, TypeAlias, TypedDict
 
 if TYPE_CHECKING:
+    from collections.abc import Collection
+
     from ..language.ast import Node
     from ..language.location import (
         FormattedSourceLocation,
@@ -17,7 +19,7 @@
 
 
 # Custom extensions
-GraphQLErrorExtensions: TypeAlias = Dict[str, Any]
+GraphQLErrorExtensions: TypeAlias = dict[str, Any]
 # Use a unique identifier name for your extension, for example the name of
 # your library or project. Do not use a shortened identifier as this increases
 # the risk of conflicts. We recommend you add at most one extension key,
@@ -176,13 +178,12 @@ def __str__(self) -> str:
         output = [self.message]
 
         if self.nodes:
-            for node in self.nodes:
-                if node.loc:
-                    output.append(print_location(node.loc))
+            output.extend(print_location(node.loc) for node in self.nodes if node.loc)
         elif self.source and self.locations:
             source = self.source
-            for location in self.locations:
-                output.append(print_source_location(source, location))
+            output.extend(
+                print_source_location(source, location) for location in self.locations
+            )
 
         return "\n\n".join(output)
 

src/graphql/error/located_error.py

@@ -3,13 +3,15 @@
 from __future__ import annotations
 
 from contextlib import suppress
-from typing import TYPE_CHECKING, Collection
+from typing import TYPE_CHECKING
 
 from ..language.source import Source, is_source
 from ..pyutils import inspect
 from .graphql_error import GraphQLError
 
 if TYPE_CHECKING:
+    from collections.abc import Collection
+
     from ..language.ast import Node
 
 __all__ = ["located_error"]

src/graphql/execution/async_iterables.py

@@ -2,23 +2,16 @@
 
 from __future__ import annotations
 
+from collections.abc import AsyncGenerator, AsyncIterable, Awaitable, Callable
 from contextlib import AbstractAsyncContextManager, suppress
-from typing import (
-    AsyncGenerator,
-    AsyncIterable,
-    Awaitable,
-    Callable,
-    Generic,
-    TypeVar,
-    Union,
-)
+from typing import Generic, TypeVar
 
 __all__ = ["aclosing", "map_async_iterable"]
 
 T = TypeVar("T")
 V = TypeVar("V")
 
-AsyncIterableOrGenerator = Union[AsyncGenerator[T, None], AsyncIterable[T]]
+AsyncIterableOrGenerator = AsyncGenerator[T, None] | AsyncIterable[T]
 
 suppress_exceptions = suppress(Exception)
 

src/graphql/execution/execute.py

@@ -7,26 +7,24 @@
     ensure_future,
     sleep,
 )
-from contextlib import suppress
-from copy import copy
-from typing import (
-    TYPE_CHECKING,
-    Any,
+from collections.abc import (
     AsyncGenerator,
     AsyncIterable,
     AsyncIterator,
     Awaitable,
     Callable,
-    Generic,
     Iterable,
-    List,
     Mapping,
-    NamedTuple,
-    Optional,
     Sequence,
-    Tuple,
+)
+from contextlib import suppress
+from copy import copy
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Generic,
+    NamedTuple,
     TypeVar,
-    Union,
     cast,
 )
 
@@ -147,7 +145,7 @@
 # 3) inline fragment "spreads" e.g. "...on Type { a }"
 
 
-Middleware: TypeAlias = Optional[Union[Tuple, List, MiddlewareManager]]
+Middleware: TypeAlias = tuple | list | MiddlewareManager | None
 
 
 class StreamUsage(NamedTuple):
@@ -1339,7 +1337,7 @@ async def await_complete_object_value() -> Any:
                 return value  # pragma: no cover
 
             return await_complete_object_value()
-        runtime_type = cast("Optional[str]", runtime_type)
+        runtime_type = cast("str | None", runtime_type)
 
         return self.complete_object_value(
             self.ensure_valid_runtime_type(

src/graphql/execution/incremental_graph.py

@@ -11,17 +11,7 @@
     isfuture,
     sleep,
 )
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    AsyncGenerator,
-    Awaitable,
-    Generator,
-    Iterable,
-    Sequence,
-    Union,
-    cast,
-)
+from typing import TYPE_CHECKING, Any, cast
 
 from ..pyutils import BoxedAwaitableOrValue, Undefined
 from .types import (
@@ -33,6 +23,7 @@
 )
 
 if TYPE_CHECKING:
+    from collections.abc import AsyncGenerator, Awaitable, Generator, Iterable, Sequence
     from typing import TypeGuard
 
     from ..error.graphql_error import GraphQLError
@@ -71,7 +62,7 @@ def __init__(self, deferred_fragment_record: DeferredFragmentRecord) -> None:
         self.children = []
 
 
-SubsequentResultNode = Union[DeferredFragmentNode, StreamRecord]
+SubsequentResultNode = DeferredFragmentNode | StreamRecord
 
 
 def is_deferred_fragment_node(

src/graphql/execution/incremental_publisher.py

@@ -7,10 +7,8 @@
 from typing import (
     TYPE_CHECKING,
     Any,
-    AsyncGenerator,
     NamedTuple,
     Protocol,
-    Sequence,
     cast,
 )
 
@@ -29,6 +27,8 @@
 )
 
 if TYPE_CHECKING:
+    from collections.abc import AsyncGenerator, Sequence
+
     from ..error import GraphQLError
     from .types import (
         CancellableStreamRecord,

src/graphql/execution/middleware.py

@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable, Iterator
 from functools import partial, reduce
 from inspect import isfunction
-from typing import Any, Callable, Iterator, TypeAlias
+from typing import Any, TypeAlias
 
 __all__ = ["MiddlewareManager"]
 

src/graphql/execution/types.py

@@ -2,18 +2,14 @@
 
 from __future__ import annotations
 
+from collections.abc import AsyncGenerator, Awaitable, Callable, Iterator
 from typing import (
     TYPE_CHECKING,
     Any,
-    AsyncGenerator,
-    Awaitable,
-    Callable,
-    Iterator,
     NamedTuple,
     TypeAlias,
     TypedDict,
     TypeVar,
-    Union,
 )
 
 from ..pyutils import BoxedAwaitableOrValue, Undefined
@@ -573,11 +569,11 @@ class FormattedIncrementalStreamResult(TypedDict):
 
 T = TypeVar("T")  # declare T for generic aliases
 
-IncrementalResult: TypeAlias = Union[IncrementalDeferResult, IncrementalStreamResult]
+IncrementalResult: TypeAlias = IncrementalDeferResult | IncrementalStreamResult
 
-FormattedIncrementalResult: TypeAlias = Union[
-    FormattedIncrementalDeferResult, FormattedIncrementalStreamResult
-]
+FormattedIncrementalResult: TypeAlias = (
+    FormattedIncrementalDeferResult | FormattedIncrementalStreamResult
+)
 
 
 class PendingResult:  # noqa: PLW1641
@@ -758,10 +754,10 @@ def is_non_reconcilable_deferred_grouped_field_set_result(
     )
 
 
-DeferredGroupedFieldSetResult: TypeAlias = Union[
-    ReconcilableDeferredGroupedFieldSetResult,
-    NonReconcilableDeferredGroupedFieldSetResult,
-]
+DeferredGroupedFieldSetResult: TypeAlias = (
+    ReconcilableDeferredGroupedFieldSetResult
+    | NonReconcilableDeferredGroupedFieldSetResult
+)
 
 
 def is_deferred_grouped_field_set_result(
@@ -775,9 +771,9 @@ def is_deferred_grouped_field_set_result(
     )
 
 
-ThunkIncrementalResult: TypeAlias = Union[
-    BoxedAwaitableOrValue[T], Callable[[], BoxedAwaitableOrValue[T]]
-]
+ThunkIncrementalResult: TypeAlias = (
+    BoxedAwaitableOrValue[T] | Callable[[], BoxedAwaitableOrValue[T]]
+)
 
 
 class DeferredGroupedFieldSetRecord:
@@ -873,7 +869,7 @@ def __repr__(self) -> str:
         return f"{name}({', '.join(args)})"
 
 
-SubsequentResultRecord: TypeAlias = Union[DeferredFragmentRecord, StreamRecord]
+SubsequentResultRecord: TypeAlias = DeferredFragmentRecord | StreamRecord
 
 
 class CancellableStreamRecord(StreamRecord):
@@ -910,8 +906,8 @@ class StreamItemsResult(NamedTuple):
     errors: list[GraphQLError] | None = None
 
 
-IncrementalDataRecord: TypeAlias = Union[DeferredGroupedFieldSetRecord, StreamRecord]
+IncrementalDataRecord: TypeAlias = DeferredGroupedFieldSetRecord | StreamRecord
 
-IncrementalDataRecordResult: TypeAlias = Union[
-    DeferredGroupedFieldSetResult, StreamItemsResult
-]
+IncrementalDataRecordResult: TypeAlias = (
+    DeferredGroupedFieldSetResult | StreamItemsResult
+)