derivepassphrase.git

@@ -47,7 +47,7 @@ else:

 if TYPE_CHECKING:

     import types

     from collections.abc import (

-        Iterator,

+        Generator,

         Mapping,

     )

     from contextlib import AbstractContextManager

@@ -564,7 +564,7 @@ def get_suitable_ssh_keys(

     | Sequence[str]

     | None = None,

     /,

-) -> Iterator[_types.SSHKeyCommentPair]:

+) -> Generator[_types.SSHKeyCommentPair, None, None]:

     """Yield all SSH keys suitable for passphrase derivation.

     Suitable SSH keys are queried from the running SSH agent (see

@@ -36,7 +36,7 @@ from typing_extensions import TypeAlias, override

 from derivepassphrase import _internals

 if TYPE_CHECKING:

-    from collections.abc import Iterable, Iterator, Mapping, Sequence

+    from collections.abc import Generator, Iterable, Mapping, Sequence

     from typing_extensions import Any, Self

@@ -2589,7 +2589,7 @@ def _write_po_file(  # noqa: C901,PLR0912

 def _format_po_info(

     data: Mapping[str, Any],

     /,

-) -> Iterator[str]:  # pragma: no cover [internal]

+) -> Generator[str, None, None]:  # pragma: no cover [internal]

     """"""  # noqa: D419

     sortorder = [

         "project-id-version",

@@ -26,7 +26,7 @@ from typing_extensions import (

 )

 if TYPE_CHECKING:

-    from collections.abc import Callable, Iterator, Sequence

+    from collections.abc import Callable, Generator, Sequence

     from typing import Literal

     from typing_extensions import (

@@ -253,7 +253,7 @@ class _VaultConfigValidator:

     def walk_subconfigs(

         self,

-    ) -> Iterator[tuple[tuple[str] | tuple[str, str], str, Any]]:

+    ) -> Generator[tuple[tuple[str] | tuple[str, str], str, Any], None, None]:

         obj = cast("dict[str, dict[str, Any]]", self.maybe_config)

         if isinstance(obj.get("global", False), dict):

             for k, v in list(obj["global"].items()):

@@ -338,7 +338,7 @@ class _VaultConfigValidator:

             elif not allow_unknown_settings:

                 raise ValueError(err_unknown_setting.format(**kwargs))

-    def clean_up_falsy_values(self) -> Iterator[CleanupStep]:  # noqa: C901

+    def clean_up_falsy_values(self) -> Generator[CleanupStep, None, None]:  # noqa: C901

         obj = self.maybe_config

         if (

             not isinstance(obj, dict)

@@ -40,7 +40,7 @@ if TYPE_CHECKING:

     from typing_extensions import Buffer

 if TYPE_CHECKING:

-    from collections.abc import Iterator

+    from collections.abc import Generator

     from cryptography.hazmat.primitives import ciphers, hashes, hmac, padding

     from cryptography.hazmat.primitives.ciphers import algorithms, modes

@@ -666,7 +666,7 @@ def _decrypt_bucket_file(

     master_keys: _types.StoreroomMasterKeys,

     *,

     root_dir: str | bytes | os.PathLike = ".",

-) -> Iterator[Buffer]:

+) -> Generator[Buffer, None, None]:

     """Decrypt a complete bucket.

     Args:

@@ -29,7 +29,7 @@ from typing import TYPE_CHECKING

 from typing_extensions import assert_type

 if TYPE_CHECKING:

-    from collections.abc import Iterator, Sequence

+    from collections.abc import Generator, Sequence

 __all__ = ("Sequin", "SequinExhaustedError")

@@ -87,7 +87,7 @@ class Sequin:

         """

         msg = "sequence item out of range"

-        def uint8_to_bits(value: int) -> Iterator[int]:

+        def uint8_to_bits(value: int) -> Generator[int, None, None]:

             """Yield individual bits of an 8-bit number, MSB first."""

             for i in (0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01):

                 yield 1 if value | i == value else 0

@@ -20,7 +20,7 @@ if sys.version_info < (3, 11):

     from exceptiongroup import ExceptionGroup

 if TYPE_CHECKING:

-    from collections.abc import Iterable, Iterator

+    from collections.abc import Generator, Iterable

     from collections.abc import Set as AbstractSet

     from types import TracebackType

@@ -442,7 +442,7 @@ class SSHAgentClient:

         | _types.SSHAgentSocket

         | Sequence[str]

         | None = None,

-    ) -> Iterator[SSHAgentClient]:

+    ) -> Generator[SSHAgentClient, None, None]:

         """Return an SSH agent client subcontext.

         If necessary, construct an SSH agent client first using the

@@ -25,7 +25,7 @@ from tests.machinery import hypothesis as hypothesis_machinery

 from tests.machinery import pytest as pytest_machinery

 if TYPE_CHECKING:

-    from collections.abc import Iterator, Sequence

+    from collections.abc import Generator, Sequence

 startup_ssh_auth_sock = os.environ.get("SSH_AUTH_SOCK", None)

@@ -55,7 +55,9 @@ def pytest_configure(config: pytest.Config) -> None:

 # https://docs.pytest.org/en/stable/explanation/fixtures.html#a-note-about-fixture-cleanup

 # https://github.com/pytest-dev/pytest/issues/5243#issuecomment-491522595

 @pytest.fixture(scope="session", autouse=False)

-def term_handler() -> Iterator[None]:  # pragma: no cover [external]

+def term_handler() -> Generator[

+    None, None, None

+]:  # pragma: no cover [external]

     try:

         import signal  # noqa: PLC0415

@@ -581,7 +583,7 @@ Popen = TypeVar("Popen", bound=subprocess.Popen)

 @contextlib.contextmanager

 def terminate_on_exit(

     proc: Popen,

-) -> Iterator[Popen]:  # pragma: unless posix no cover [unused]

+) -> Generator[Popen, None, None]:  # pragma: unless posix no cover [unused]

     """Terminate and wait for the subprocess upon exiting the context.

     Args:

@@ -610,7 +612,9 @@ def spawn_named_agent(  # noqa: C901

     spawn_func: SSHAgentSpawnFunc | SSHAgentInterfaceFunc,

     agent_type: data.KnownSSHAgentType,

     agent_name: str,

-) -> Iterator[data.SpawnedSSHAgentInfo]:  # pragma: no cover [external]

+) -> Generator[

+    data.SpawnedSSHAgentInfo, None, None

+]:  # pragma: no cover [external]

     """Spawn the named SSH agent and check that it is operational.

     Using the correct agent-specific spawn function from the

@@ -792,7 +796,7 @@ def spawn_named_agent(  # noqa: C901

 )

 def running_ssh_agent(  # pragma: no cover [external]

     request: pytest.FixtureRequest,

-) -> Iterator[data.RunningSSHAgentInfo]:

+) -> Generator[data.RunningSSHAgentInfo, None, None]:

     """Ensure a running SSH agent, if possible, as a pytest fixture.

     Check for a running SSH agent, or spawn/interface a new one if

@@ -818,7 +822,7 @@ def running_ssh_agent(  # pragma: no cover [external]

     def prepare_environment(

         agent_type: data.KnownSSHAgentType,

-    ) -> Iterator[data.RunningSSHAgentInfo]:

+    ) -> Generator[data.RunningSSHAgentInfo, None, None]:

         with pytest.MonkeyPatch.context() as monkeypatch:

             if agent_type == data.KnownSSHAgentType.StubbedSSHAgent:

                 monkeypatch.setattr(

@@ -874,7 +878,9 @@ def running_ssh_agent(  # pragma: no cover [external]

 @pytest.fixture(params=spawn_handlers_params)

 def spawn_ssh_agent(

     request: pytest.FixtureRequest,

-) -> Iterator[data.SpawnedSSHAgentInfo]:  # pragma: no cover [external]

+) -> Generator[

+    data.SpawnedSSHAgentInfo, None, None

+]:  # pragma: no cover [external]

     """Spawn or interface an SSH agent, as a pytest fixture.

     Spawn a new SSH agent (isolated from other SSH use by other

@@ -1053,7 +1059,7 @@ def _load_key_optimistically(

 @pytest.fixture

 def ssh_agent_client_with_test_keys_loaded(

     spawn_ssh_agent: data.SpawnedSSHAgentInfo,

-) -> Iterator[ssh_agent.SSHAgentClient]:

+) -> Generator[ssh_agent.SSHAgentClient, None, None]:

     """Provide an SSH agent with loaded test keys, as a pytest fixture.

     Use the `spawn_ssh_agent` fixture to acquire a usable SSH agent,

@@ -27,7 +27,7 @@ __all__ = ()

 if TYPE_CHECKING:

     import socket

-    from collections.abc import Iterator

+    from collections.abc import Generator

     from typing_extensions import Any

@@ -99,7 +99,9 @@ def list_keys_singleton(self: Any = None) -> list[_types.SSHKeyCommentPair]:

 # -------------

-def suitable_ssh_keys(conn: Any) -> Iterator[_types.SSHKeyCommentPair]:

+def suitable_ssh_keys(

+    conn: Any,

+) -> Generator[_types.SSHKeyCommentPair, None, None]:

     """Return a two-item list of SSH test keys (key/comment pairs).

     Intended as a monkeypatching replacement for

@@ -32,7 +32,13 @@ __all__ = ()

 if TYPE_CHECKING:

     import types

-    from collections.abc import Callable, Iterator, Mapping, Sequence

+    from collections.abc import (

+        Callable,

+        Generator,

+        Iterable,

+        Mapping,

+        Sequence,

+    )

     from contextlib import AbstractContextManager

     from typing import IO, Literal, NotRequired

@@ -500,7 +506,7 @@ class StubbedSSHAgentSocket:

         self._check_for_io_on_closed_connection()

         self.receive_from_client.extend(memoryview(data))

         while self.receive_from_client:

-            result: Buffer | Iterator[int]

+            result: Buffer | Iterable[int]

             if len(self.receive_from_client) < self.HEADER_SIZE:

                 break

             count = int.from_bytes(

@@ -599,7 +605,7 @@ class StubbedSSHAgentSocket:

         extension_marker = b"\x1b" + string(extension.encode("ascii"))

         return self.receive_from_client.startswith(extension_marker, 4)

-    def query_extensions(self) -> Iterator[int]:

+    def query_extensions(self) -> Generator[int, None, None]:

         """Answer an `SSH_AGENTC_EXTENSION` request.

         Yields:

@@ -619,7 +625,7 @@ class StubbedSSHAgentSocket:

     def request_identities(

         self, *, list_extended: bool = False

-    ) -> Iterator[int]:

+    ) -> Generator[int, None, None]:

         """Answer an `SSH_AGENTC_REQUEST_IDENTITIES` request.

         Args:

@@ -41,7 +41,7 @@ from derivepassphrase.ssh_agent import socketprovider

 __all__ = ()

 if TYPE_CHECKING:

-    from collections.abc import Callable, Iterator, Sequence

+    from collections.abc import Callable, Generator, Sequence

     from contextlib import AbstractContextManager

     from typing_extensions import Any

@@ -225,7 +225,7 @@ class Parametrize(types.SimpleNamespace):

 def faked_entry_point_list(  # noqa: C901

     additional_entry_points: Sequence[importlib.metadata.EntryPoint],

     remove_conflicting_entries: bool = False,

-) -> Iterator[Sequence[str]]:

+) -> Generator[Sequence[str], None, None]:

     """Yield a context where additional entry points are visible.

     Args:

@@ -371,7 +371,7 @@ def isolated_config(

     monkeypatch: pytest.MonkeyPatch,

     runner: tests.machinery.CliRunner,

     main_config_str: str | None = None,

-) -> Iterator[None]:

+) -> Generator[None, None, None]:

     """Provide an isolated configuration setup, as a context.

     This context manager sets up (and changes into) a temporary

@@ -429,7 +429,7 @@ def isolated_vault_config(

     runner: tests.machinery.CliRunner,

     vault_config: Any,

     main_config_str: str | None = None,

-) -> Iterator[None]:

+) -> Generator[None, None, None]:

     """Provide an isolated vault configuration setup, as a context.

     Uses [`isolated_config`][] internally.  Beyond those actions, this

@@ -467,7 +467,7 @@ def isolated_vault_exporter_config(

     runner: tests.machinery.CliRunner,

     vault_config: str | bytes | None = None,

     vault_key: str | None = None,

-) -> Iterator[None]:

+) -> Generator[None, None, None]:

     """Provide an isolated vault configuration setup, as a context.

     Works similarly to [`isolated_config`][], except that no user

@@ -509,7 +509,7 @@ def isolated_vault_exporter_config(

             @contextlib.contextmanager

             def chdir(

                 newpath: str | bytes | os.PathLike,

-            ) -> Iterator[None]:  # pragma: no branch

+            ) -> Generator[None, None, None]:  # pragma: no branch

                 oldpath = pathlib.Path.cwd().resolve()

                 os.chdir(newpath)

                 try:

@@ -29,7 +29,7 @@ from derivepassphrase import _types, ssh_agent, vault

 from tests import data, machinery

 if TYPE_CHECKING:

-    from collections.abc import Iterator

+    from collections.abc import Generator

     from typing_extensions import Buffer

@@ -498,7 +498,7 @@ class TestStubbedSSHAgentSocket:

     @contextlib.contextmanager

     def _get_agent(

         self, *, extended_agent: bool | None = False

-    ) -> Iterator[machinery.StubbedSSHAgentSocket]:

+    ) -> Generator[machinery.StubbedSSHAgentSocket, None, None]:

         agent_class: type[machinery.StubbedSSHAgentSocket] = (

             machinery.StubbedSSHAgentSocketWithAddressAndDeterministicDSA

             if extended_agent

@@ -29,7 +29,7 @@ from tests import data, machinery

 from tests.machinery import pytest as pytest_machinery

 if TYPE_CHECKING:

-    from collections.abc import Iterator

+    from collections.abc import Generator

 DUMMY_SERVICE = data.DUMMY_SERVICE

 DUMMY_PASSPHRASE = data.DUMMY_PASSPHRASE

@@ -315,7 +315,7 @@ class TestUserConfigurationFileOther:

         self,

         *,

         main_config: str = "",

-    ) -> Iterator[pytest.MonkeyPatch]:

+    ) -> Generator[pytest.MonkeyPatch, None, None]:

         runner = machinery.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

@@ -27,7 +27,7 @@ from tests import machinery

 from tests.machinery import pytest as pytest_machinery

 if TYPE_CHECKING:

-    from collections.abc import Iterator

+    from collections.abc import Generator

 class VersionOutputData(NamedTuple):

@@ -334,7 +334,7 @@ def tokenize_version_output_item_listing(

     /,

     *,

     is_alias_annotation: bool = False,

-) -> Iterator[str]:

+) -> Generator[str, None, None]:

     """Yield the next feature in a `--version` feature listing.

     This is a regular expression-based parser (alluded to in

@@ -42,7 +42,7 @@ from tests.machinery import hypothesis as hypothesis_machinery

 from tests.machinery import pytest as pytest_machinery

 if TYPE_CHECKING:

-    from collections.abc import Callable, Iterable, Iterator

+    from collections.abc import Callable, Generator, Iterable

     from typing import NoReturn

     from typing_extensions import Any

@@ -83,7 +83,7 @@ def vault_config_exporter_shell_interpreter(  # noqa: C901

     # about here.

     command: click.Command | click.Group | None = None,

     runner: machinery.CliRunner | None = None,

-) -> Iterator[machinery.ReadableResult]:

+) -> Generator[machinery.ReadableResult, None, None]:

     """A rudimentary sh(1) interpreter for `--export-as=sh` output.

     Assumes a script as emitted by `derivepassphrase vault

@@ -1265,7 +1265,7 @@ class TestTempdir:

         @contextlib.contextmanager

         def make_temporary_directory(

             path: pathlib.Path,

-        ) -> Iterator[pathlib.Path]:

+        ) -> Generator[pathlib.Path, None, None]:

             try:

                 path.mkdir()

                 yield path

@@ -25,7 +25,7 @@ from tests.data import callables

 from tests.machinery import pytest as pytest_machinery

 if TYPE_CHECKING:

-    from collections.abc import Iterator

+    from collections.abc import Generator

     from typing import NoReturn

 DUMMY_SERVICE = data.DUMMY_SERVICE

@@ -568,7 +568,7 @@ class TestKeyBasic:

         main_config_str: str | None = None,

         registry: dict[str, _types.SSHAgentSocketProvider | str | None]

         | None = None,

-    ) -> Iterator[machinery.CliRunner]:

+    ) -> Generator[machinery.CliRunner, None, None]:

         runner = machinery.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

@@ -901,7 +901,7 @@ class TestInvalidCommandLines:

                 DUMMY_SERVICE: {**DUMMY_CONFIG_SETTINGS},

             },

         },

-    ) -> Iterator[machinery.CliRunner]:

+    ) -> Generator[machinery.CliRunner, None, None]:

         runner = machinery.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

@@ -39,7 +39,7 @@ from tests.machinery import hypothesis as hypothesis_machinery

 from tests.machinery import pytest as pytest_machinery

 if TYPE_CHECKING:

-    from collections.abc import Iterator

+    from collections.abc import Generator

     from typing import NoReturn

     from typing_extensions import Any

@@ -306,7 +306,7 @@ class TestImportConfigInvalid:

     """Tests concerning `vault` configuration imports: invalid imports."""

     @contextlib.contextmanager

-    def _setup_environment(self) -> Iterator[machinery.CliRunner]:

+    def _setup_environment(self) -> Generator[machinery.CliRunner, None, None]:

         runner = machinery.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

@@ -527,7 +527,7 @@ class TestExportConfigInvalid:

         *,

         config: _types.VaultConfig = {"services": {}},  # noqa: B006

         error_messages: tuple[str, ...] = (),

-    ) -> Iterator[list[str]]:

+    ) -> Generator[list[str], None, None]:

         runner = machinery.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

@@ -719,7 +719,7 @@ class TestStoringConfigurationFailures:

             "services": {},

         },

         patch_suitable_ssh_keys: bool = True,

-    ) -> Iterator[pytest.MonkeyPatch]:

+    ) -> Generator[pytest.MonkeyPatch, None, None]:

         runner = machinery.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

@@ -36,7 +36,7 @@ from cryptography.hazmat.primitives.ciphers import (  # noqa: E402

 )

 if TYPE_CHECKING:

-    from collections.abc import Callable, Iterator

+    from collections.abc import Callable, Generator

     from typing import Any

     from typing_extensions import Buffer, Literal

@@ -256,7 +256,7 @@ class TestCLIFailures:

         *,

         vault_config: str | bytes = data.VAULT_V03_CONFIG,

         vault_key: str = data.VAULT_MASTER_KEY,

-    ) -> Iterator[pytest.MonkeyPatch]:

+    ) -> Generator[pytest.MonkeyPatch, None, None]:

         runner = machinery.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

@@ -354,7 +354,7 @@ class TestStoreroom:

         *,

         vault_config: str | bytes = data.VAULT_STOREROOM_CONFIG_ZIPPED,

         vault_key: str = data.VAULT_MASTER_KEY,

-    ) -> Iterator[tuple[pytest.MonkeyPatch, machinery.CliRunner]]:

+    ) -> Generator[tuple[pytest.MonkeyPatch, machinery.CliRunner], None, None]:

         runner = machinery.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

@@ -575,7 +575,7 @@ class TestVaultNativeConfig:

         *,

         vault_config: str | bytes = data.VAULT_V03_CONFIG,

         vault_key: str = data.VAULT_MASTER_KEY,

-    ) -> Iterator[tuple[pytest.MonkeyPatch, machinery.CliRunner]]:

+    ) -> Generator[tuple[pytest.MonkeyPatch, machinery.CliRunner], None, None]:

         runner = machinery.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

@@ -23,7 +23,7 @@ from tests import data, machinery

 from tests.machinery import pytest as pytest_machinery

 if TYPE_CHECKING:

-    from collections.abc import Callable, Iterator

+    from collections.abc import Callable, Generator

     from typing_extensions import Any, Buffer

@@ -179,7 +179,7 @@ class TestCLIUtilities:

             return TestCLIUtilities.VaultKeyEnvironment(expected, *env_vars)

     @contextlib.contextmanager

-    def _setup_environment(self) -> Iterator[pytest.MonkeyPatch]:

+    def _setup_environment(self) -> Generator[pytest.MonkeyPatch, None, None]:

         runner = machinery.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

@@ -353,7 +353,7 @@ class TestExportVaultConfigDataHandlerRegistry:

         *,

         registry: dict[str, Any] | None = None,

         find_handlers: Callable | None = None,

-    ) -> Iterator[pytest.MonkeyPatch]:

+    ) -> Generator[pytest.MonkeyPatch, None, None]:

         with pytest.MonkeyPatch.context() as monkeypatch:

             if registry is not None:  # pragma: no branch

                 monkeypatch.setattr(

@@ -435,7 +435,7 @@ class TestGenericVaultCLIErrors:

     @contextlib.contextmanager

     def _setup_environment(

         self, *, vault_config: str | bytes = data.VAULT_V03_CONFIG

-    ) -> Iterator[tuple[pytest.MonkeyPatch, machinery.CliRunner]]:

+    ) -> Generator[tuple[pytest.MonkeyPatch, machinery.CliRunner], None, None]:

         runner = machinery.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

@@ -30,7 +30,12 @@ from tests.data import callables

 from tests.machinery import pytest as pytest_machinery

 if TYPE_CHECKING:

-    from collections.abc import Callable, Iterator, Mapping, Sequence

+    from collections.abc import (

+        Callable,

+        Generator,

+        Mapping,

+        Sequence,

+    )

     from typing_extensions import Any, Literal

@@ -39,7 +44,7 @@ if sys.version_info < (3, 11):

 @pytest.fixture

-def use_stub_agent() -> Iterator[None]:

+def use_stub_agent() -> Generator[None, None, None]:

     """Enforce use of the stubbed SSH agent."""

     with pytest.MonkeyPatch.context() as monkeypatch:

         monkeypatch.setattr(

@@ -848,7 +853,7 @@ class TestSSHAgentSocketProviderRegistry:

         resolve = socketprovider.SocketProvider.resolve

         register = socketprovider.SocketProvider.register

-        def ancestry_chain(name: str) -> Iterator[str]:

+        def ancestry_chain(name: str) -> Generator[str, None, None]:

             current: _types.SSHAgentSocketProvider | str | None = name

             seen: set[_types.SSHAgentSocketProvider | str | None] = set()

             while isinstance(current, str) and current not in seen:

@@ -1204,7 +1209,9 @@ class TestAgentErrorResponses:

             data.AgentProtocolRequest, Sequence[data.AgentProtocolResponse]

         ],

         /,

-    ) -> Iterator[tuple[pytest.MonkeyPatch, ssh_agent.SSHAgentClient]]:

+    ) -> Generator[

+        tuple[pytest.MonkeyPatch, ssh_agent.SSHAgentClient], None, None

+    ]:

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -1558,7 +1565,7 @@ class TestWindowsNamedPipeHandle:

     @contextlib.contextmanager

     def stub_createfile_and_closehandle(

         self,

-    ) -> Iterator[None]:

+    ) -> Generator[None, None, None]:

         singleton = object()

         def create_file(*_args: Any, **_kwargs: Any) -> object:

@@ -21,7 +21,7 @@ from hypothesis import strategies

 from derivepassphrase._internals import cli_messages as msg

 if TYPE_CHECKING:

-    from collections.abc import Iterator

+    from collections.abc import Generator

     from typing import ClassVar

@@ -32,7 +32,7 @@ class Parametrize(types.SimpleNamespace):

 @pytest.fixture(scope="class")

-def use_debug_translations() -> Iterator[None]:

+def use_debug_translations() -> Generator[None, None, None]:

     """Force the use of debug translations (pytest class fixture)."""

     with pytest.MonkeyPatch.context() as monkeypatch:

         monkeypatch.setattr(msg, "translation", msg.DebugTranslations())

@@ -40,7 +40,7 @@ def use_debug_translations() -> Iterator[None]:

 @contextlib.contextmanager

-def monkeypatched_null_translations() -> Iterator[None]:

+def monkeypatched_null_translations() -> Generator[None, None, None]:

     """Force the use of no-op translations in this context."""

     with pytest.MonkeyPatch.context() as monkeypatch:

         monkeypatch.setattr(msg, "translation", gettext.NullTranslations())