style: Format code for Python 3.10

pawamoy · pawamoy · commit e30c32143149 · 2026-02-09T21:14:21.000+01:00
diff --git a/packages/griffecli/src/griffecli/_internal/cli.py b/packages/griffecli/src/griffecli/_internal/cli.py
@@ -20,12 +20,12 @@
 import sys
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import IO, TYPE_CHECKING, Any, Callable
+from typing import IO, TYPE_CHECKING, Any
 
 import colorama
 
 if TYPE_CHECKING:
-    from collections.abc import Sequence
+    from collections.abc import Callable, Sequence
 
     from griffe._internal.docstrings.parsers import DocstringOptions, DocstringStyle
     from griffe._internal.enumerations import ExplanationStyle, Parser
diff --git a/packages/griffelib/src/griffe/_internal/agents/nodes/assignments.py b/packages/griffelib/src/griffe/_internal/agents/nodes/assignments.py
@@ -3,7 +3,10 @@
 from __future__ import annotations
 
 import ast
-from typing import Any, Callable
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
 
 
 def _get_attribute_name(node: ast.Attribute) -> str:
diff --git a/packages/griffelib/src/griffe/_internal/agents/nodes/exports.py b/packages/griffelib/src/griffe/_internal/agents/nodes/exports.py
@@ -4,14 +4,16 @@
 
 import ast
 from contextlib import suppress
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 from griffe._internal.agents.nodes.values import get_value
 from griffe._internal.enumerations import LogLevel
 from griffe._internal.expressions import ExprName
 from griffe._internal.logger import logger
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from griffe._internal.models import Module
 
 
diff --git a/packages/griffelib/src/griffe/_internal/agents/nodes/parameters.py b/packages/griffelib/src/griffe/_internal/agents/nodes/parameters.py
@@ -4,14 +4,14 @@
 
 import ast
 from itertools import zip_longest
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING
 
 from griffe._internal.enumerations import ParameterKind
 
 if TYPE_CHECKING:
     from collections.abc import Iterable
 
-ParametersType = list[tuple[str, Optional[ast.AST], ParameterKind, Optional[Union[str, ast.AST]]]]
+ParametersType = list[tuple[str, ast.AST | None, ParameterKind, str | ast.AST | None]]
 """Type alias for the list of parameters of a function."""
 
 
diff --git a/packages/griffelib/src/griffe/_internal/docstrings/parsers.py b/packages/griffelib/src/griffe/_internal/docstrings/parsers.py
@@ -3,7 +3,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, Literal, Union
+from typing import TYPE_CHECKING, Any, Literal
 
 from griffe._internal.docstrings.auto import AutoOptions, parse_auto
 from griffe._internal.docstrings.google import GoogleOptions, parse_google
@@ -13,12 +13,14 @@
 from griffe._internal.enumerations import Parser
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from griffe._internal.models import Docstring
 
 
 DocstringStyle = Literal["google", "numpy", "sphinx", "auto"]
 """The supported docstring styles (literal values of the Parser enumeration)."""
-DocstringOptions = Union[GoogleOptions, NumpyOptions, SphinxOptions, AutoOptions]
+DocstringOptions = GoogleOptions | NumpyOptions | SphinxOptions | AutoOptions
 """The options for each docstring style."""
 
 
diff --git a/packages/griffelib/src/griffe/_internal/docstrings/sphinx.py b/packages/griffelib/src/griffe/_internal/docstrings/sphinx.py
@@ -9,7 +9,7 @@
 from contextlib import suppress
 from dataclasses import dataclass, field
 from inspect import cleandoc
-from typing import TYPE_CHECKING, Any, Callable, TypedDict
+from typing import TYPE_CHECKING, Any, TypedDict
 
 from griffe._internal.docstrings.models import (
     DocstringAttribute,
@@ -26,6 +26,8 @@
 from griffe._internal.docstrings.utils import docstring_warning, parse_docstring_annotation
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from griffe._internal.expressions import Expr
     from griffe._internal.models import Docstring
 
diff --git a/packages/griffelib/src/griffe/_internal/encoders.py b/packages/griffelib/src/griffe/_internal/encoders.py
@@ -5,7 +5,7 @@
 
 import json
 from pathlib import Path, PosixPath, WindowsPath
-from typing import Any, Callable
+from typing import TYPE_CHECKING, Any
 
 from griffe._internal import expressions
 from griffe._internal.enumerations import Kind, ParameterKind, TypeParameterKind
@@ -26,6 +26,9 @@
     TypeParameters,
 )
 
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
 _json_encoder_map: dict[type, Callable[[Any], Any]] = {
     Path: str,
     PosixPath: str,
diff --git a/packages/griffelib/src/griffe/_internal/expressions.py b/packages/griffelib/src/griffe/_internal/expressions.py
@@ -395,7 +395,7 @@ class ExprCompare(Expr):
     def iterate(self, *, flat: bool = True) -> Iterator[str | Expr]:
         precedence = _get_precedence(self)
         yield from _yield(self.left, flat=flat, outer_precedence=precedence, is_left=True)
-        for op, comp in zip(self.operators, self.comparators):
+        for op, comp in zip(self.operators, self.comparators, strict=False):
             yield f" {op} "
             yield from _yield(comp, flat=flat, outer_precedence=precedence)
 
@@ -452,7 +452,7 @@ class ExprDict(Expr):
     def iterate(self, *, flat: bool = True) -> Iterator[str | Expr]:
         yield "{"
         yield from _join(
-            (("None" if key is None else key, ": ", value) for key, value in zip(self.keys, self.values)),
+            (("None" if key is None else key, ": ", value) for key, value in zip(self.keys, self.values, strict=False)),
             ", ",
             flat=flat,
         )
diff --git a/packages/griffelib/src/griffe/_internal/extensions/base.py b/packages/griffelib/src/griffe/_internal/extensions/base.py
@@ -8,7 +8,7 @@
 from importlib.util import module_from_spec, spec_from_file_location
 from inspect import isclass
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Union
+from typing import TYPE_CHECKING, Any
 
 from griffe._internal.agents.nodes.ast import ast_children, ast_kind
 from griffe._internal.exceptions import ExtensionNotLoadedError
@@ -435,7 +435,7 @@ def on_package(self, *, pkg: Module, loader: GriffeLoader, **kwargs: Any) -> Non
         """
 
 
-LoadableExtensionType = Union[str, dict[str, Any], Extension, type[Extension]]
+LoadableExtensionType = str | dict[str, Any] | Extension | type[Extension]
 """All the types that can be passed to `load_extensions`."""
 
 
diff --git a/packages/griffelib/src/griffe/_internal/extensions/dataclasses.py b/packages/griffelib/src/griffe/_internal/extensions/dataclasses.py
@@ -42,7 +42,7 @@ def _expr_args(expr: Expr) -> dict[str, str | Expr]:
                     var = collection[argument.value.canonical_path]  # ty:ignore[unresolved-attribute]
                     args.update(_expr_args(var.value))
     elif isinstance(expr, ExprDict):
-        args.update({ast.literal_eval(str(key)): value for key, value in zip(expr.keys, expr.values)})
+        args.update({ast.literal_eval(str(key)): value for key, value in zip(expr.keys, expr.values, strict=False)})
     return args
 
 
diff --git a/packages/griffelib/src/griffe/_internal/logger.py b/packages/griffelib/src/griffe/_internal/logger.py
@@ -11,10 +11,10 @@
 
 import logging
 from contextlib import contextmanager
-from typing import TYPE_CHECKING, Any, Callable, ClassVar
+from typing import TYPE_CHECKING, Any, ClassVar
 
 if TYPE_CHECKING:
-    from collections.abc import Iterator
+    from collections.abc import Callable, Iterator
 
 
 class Logger:
diff --git a/packages/griffelib/src/griffe/_internal/models.py b/packages/griffelib/src/griffe/_internal/models.py
@@ -9,7 +9,7 @@
 from dataclasses import asdict
 from pathlib import Path
 from textwrap import dedent
-from typing import TYPE_CHECKING, Any, Callable, Literal, Union, cast
+from typing import TYPE_CHECKING, Any, Literal, cast
 
 from griffe._internal.c3linear import c3linear_merge
 from griffe._internal.docstrings.parsers import DocstringOptions, DocstringStyle, parse
@@ -20,7 +20,7 @@
 from griffe._internal.mixins import ObjectAliasMixin
 
 if TYPE_CHECKING:
-    from collections.abc import Sequence
+    from collections.abc import Callable, Sequence
 
     from griffe._internal.collections import LinesCollection, ModulesCollection
     from griffe._internal.docstrings.models import DocstringSection
@@ -1924,7 +1924,7 @@ def decorators(self) -> list[Decorator]:
         See also: [`Function`][griffe.Function],
         [`Class`][griffe.Class].
         """
-        return cast("Union[Class, Function]", self.target).decorators
+        return cast("Class | Function", self.target).decorators
 
     @property
     def imports_future_annotations(self) -> bool:
@@ -1979,11 +1979,11 @@ def is_namespace_subpackage(self) -> bool:
     @property
     def overloads(self) -> dict[str, list[Function]] | list[Function] | None:
         """The overloaded signatures declared in this class/module or for this function."""
-        return cast("Union[Module, Class, Function]", self.final_target).overloads
+        return cast("Module | Class | Function", self.final_target).overloads
 
     @overloads.setter
     def overloads(self, overloads: list[Function] | None) -> None:
-        cast("Union[Module, Class, Function]", self.final_target).overloads = overloads  # ty:ignore[invalid-assignment]
+        cast("Module | Class | Function", self.final_target).overloads = overloads  # ty:ignore[invalid-assignment]
 
     @property
     def parameters(self) -> Parameters:
@@ -1993,7 +1993,7 @@ def parameters(self) -> Parameters:
         and therefore is part of the consumer API:
         do not use when producing Griffe trees!
         """
-        return cast("Union[Class, Function]", self.final_target).parameters
+        return cast("Class | Function", self.final_target).parameters
 
     @property
     def returns(self) -> str | Expr | None:
@@ -2017,7 +2017,7 @@ def deleter(self) -> Function | None:
     @property
     def value(self) -> str | Expr | None:
         """The attribute or type alias value."""
-        return cast("Union[Attribute, TypeAlias]", self.final_target).value
+        return cast("Attribute | TypeAlias", self.final_target).value
 
     @value.setter
     def value(self, value: str | Expr | None) -> None:
@@ -2055,7 +2055,7 @@ def signature(self, *, return_type: bool = False, name: str | None = None) -> st
         Returns:
             A string representation of the class/function signature.
         """
-        return cast("Union[Class, Function]", self.final_target).signature(return_type=return_type, name=name)
+        return cast("Class | Function", self.final_target).signature(return_type=return_type, name=name)
 
     # SPECIFIC ALIAS METHOD AND PROPERTIES -----------------
     # These methods and properties do not exist on targets,
diff --git a/scripts/gen_credits.py b/scripts/gen_credits.py
@@ -10,7 +10,6 @@
 from itertools import chain
 from pathlib import Path
 from textwrap import dedent
-from typing import Union
 
 from jinja2 import StrictUndefined
 from jinja2.sandbox import SandboxedEnvironment
@@ -29,7 +28,7 @@
 project_name = project["name"]
 devdeps = [dep for group in pyproject["dependency-groups"].values() for dep in group if not dep.startswith("-e")]
 
-PackageMetadata = dict[str, Union[str, Iterable[str]]]
+PackageMetadata = dict[str, str | Iterable[str]]
 Metadata = dict[str, PackageMetadata]
 
 
@@ -55,11 +54,7 @@ def _extra_marker(req: Requirement) -> str | None:
     if not req.marker:
         return None
     try:
-        return next(
-            marker[2].value
-            for marker in req.marker._markers
-            if getattr(marker[0], "value", None) == "extra"
-        )
+        return next(marker[2].value for marker in req.marker._markers if getattr(marker[0], "value", None) == "extra")
     except StopIteration:
         return None
 
diff --git a/scripts/make.py b/scripts/make.py
@@ -7,10 +7,10 @@
 import sys
 from contextlib import contextmanager
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:
-    from collections.abc import Iterator
+    from collections.abc import Callable, Iterator
 
 
 PYTHON_VERSIONS = os.getenv("PYTHON_VERSIONS", "3.10 3.11 3.12 3.13 3.14 3.15").split()
diff --git a/tests/test_diff.py b/tests/test_diff.py
@@ -177,7 +177,7 @@ def test_diff_griffe(old_code: str, new_code: str, expected_breakages: list[Brea
     with temporary_visited_module(old_code) as old_package, temporary_visited_module(new_code) as new_package:
         breaking = list(find_breaking_changes(old_package, new_package))
     assert len(breaking) == len(expected_breakages)
-    for breakage, expected_kind in zip(breaking, expected_breakages):
+    for breakage, expected_kind in zip(breaking, expected_breakages, strict=False):
         assert breakage.kind is expected_kind
     # Check with aliases.
     import_a = "from ._mod_a import a\n__all__ = ['a']"
@@ -187,7 +187,7 @@ def test_diff_griffe(old_code: str, new_code: str, expected_breakages: list[Brea
         with temporary_visited_package("package_new", new_modules) as new_package:
             breaking = list(find_breaking_changes(old_package, new_package))
     assert len(breaking) == len(expected_breakages)
-    for breakage, expected_kind in zip(breaking, expected_breakages):
+    for breakage, expected_kind in zip(breaking, expected_breakages, strict=False):
         assert breakage.kind is expected_kind
 
 
diff --git a/tests/test_docstrings/helpers.py b/tests/test_docstrings/helpers.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Protocol, Union
+from typing import TYPE_CHECKING, Any, Protocol
 
 from griffe import (
     Attribute,
@@ -19,7 +19,7 @@
     from types import ModuleType
 
 
-ParentType = Union[Module, Class, Function, Attribute, None]
+ParentType = Module | Class | Function | Attribute | None
 ParseResultType = tuple[list[DocstringSection], list[str]]
 
 
diff --git a/tests/test_docstrings/test_google.py b/tests/test_docstrings/test_google.py
@@ -1589,7 +1589,7 @@ def test_parse_returns_multiple_items(
     assert len(sections) == 1
     assert len(sections[0].value) == len(expected)
 
-    for annotated, expected_ in zip(sections[0].value, expected):
+    for annotated, expected_ in zip(sections[0].value, expected, strict=False):
         assert annotated.name == expected_.name
         assert str(annotated.annotation) == str(expected_.annotation)
         assert annotated.description == expected_.description
@@ -1660,7 +1660,7 @@ def test_parse_yields_multiple_items(
     assert len(sections) == 1
     assert len(sections[0].value) == len(expected)
 
-    for annotated, expected_ in zip(sections[0].value, expected):
+    for annotated, expected_ in zip(sections[0].value, expected, strict=False):
         assert annotated.name == expected_.name
         assert str(annotated.annotation) == str(expected_.annotation)
         assert annotated.description == expected_.description
@@ -1731,7 +1731,7 @@ def test_parse_receives_multiple_items(
     assert len(sections) == 1
     assert len(sections[0].value) == len(expected)
 
-    for annotated, expected_ in zip(sections[0].value, expected):
+    for annotated, expected_ in zip(sections[0].value, expected, strict=False):
         assert annotated.name == expected_.name
         assert str(annotated.annotation) == str(expected_.annotation)
         assert annotated.description == expected_.description
diff --git a/tests/test_inheritance.py b/tests/test_inheritance.py
@@ -2,13 +2,15 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
 
 import pytest
 
 from griffe import ModulesCollection, temporary_inspected_module, temporary_visited_module
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from griffe import Class
 
 
diff --git a/tests/test_models.py b/tests/test_models.py
@@ -190,7 +190,11 @@ def test_dataclass_parameter_kinds(code: str) -> None:
     """
     code = f"from dataclasses import dataclass, field, KW_ONLY\n\n{dedent(code)}"
     with temporary_visited_package("package", {"__init__.py": code}) as module:
-        for dataclass_param, regular_param in zip(module["Dataclass"].parameters, module["Class"].parameters):
+        for dataclass_param, regular_param in zip(
+            module["Dataclass"].parameters,
+            module["Class"].parameters,
+            strict=False,
+        ):
             assert dataclass_param == regular_param
 
 
