derivepassphrase.git

@@ -30,6 +30,9 @@ classifiers = [

     "Typing :: Typed",

 ]

 dependencies = [

+    # Our API for SSH agent socket providers is declared in a separately

+    # published package.

+    "derivepassphrase-sshagentsocketprovider",

     # We use click for the command-line interface.  We require version

     # 8.1.0 or higher due to click issue #1985.

     "click >= 8.1",

@@ -632,7 +635,10 @@ parametrize-names-type = 'list'

 ban-relative-imports = "all"

 [tool.ruff.lint.isort]

-known-first-party = ["derivepassphrase"]

+known-first-party = [

+    "derivepassphrase",

+    "derivepassphrase_sshagentsocketprovider",

+]

 [tool.ruff.lint.pycodestyle]

 ignore-overlong-task-comments = true  # for E501

@@ -61,6 +61,8 @@ if TYPE_CHECKING:

     from typing_extensions import Buffer, Self

+    import derivepassphrase_sshagentsocketprovider as d_sasp

+

 PROG_NAME = _msg.PROG_NAME

 KEY_DISPLAY_LENGTH = 50

@@ -560,7 +562,7 @@ def load_user_config() -> dict[str, Any]:

 def get_suitable_ssh_keys(

     conn: ssh_agent.SSHAgentClient

-    | _types.SSHAgentSocket

+    | d_sasp.SSHAgentSocket

     | Sequence[str]

     | None = None,

     /,

@@ -854,7 +856,7 @@ def default_error_callback(

 def select_ssh_key(

     conn: ssh_agent.SSHAgentClient

-    | _types.SSHAgentSocket

+    | d_sasp.SSHAgentSocket

     | Sequence[str]

     | None = None,

     /,

@@ -1101,13 +1103,13 @@ def check_for_misleading_passphrase(

 def get_configured_connection_hint(

     conn: ssh_agent.SSHAgentClient

-    | _types.SSHAgentSocket

+    | d_sasp.SSHAgentSocket

     | Sequence[str]

     | None = None,

     /,

     *,

     main_config: dict[str, Any],

-) -> ssh_agent.SSHAgentClient | _types.SSHAgentSocket | Sequence[str] | None:

+) -> ssh_agent.SSHAgentClient | d_sasp.SSHAgentSocket | Sequence[str] | None:

     """Return a suitable connection hint for the SSH agent client.

     If a connection hint is already known, return that connection hint.

@@ -1129,12 +1131,12 @@ def get_configured_connection_hint(

     def handle_return_value(

         val: ssh_agent.SSHAgentClient

-        | _types.SSHAgentSocket

+        | d_sasp.SSHAgentSocket

         | str

         | Sequence[str]

         | None,

     ) -> (

-        ssh_agent.SSHAgentClient | _types.SSHAgentSocket | Sequence[str] | None

+        ssh_agent.SSHAgentClient | d_sasp.SSHAgentSocket | Sequence[str] | None

     ):  # pragma: no cover [external]

         # A separate function, to easily exclude it from coverage,

         # because it's just type handling, which the type checker

@@ -1168,7 +1170,7 @@ def key_to_phrase(

     error_callback: Callable[..., NoReturn],

     warning_callback: Callable[..., None],

     conn: ssh_agent.SSHAgentClient

-    | _types.SSHAgentSocket

+    | d_sasp.SSHAgentSocket

     | Sequence[str]

     | None = None,

 ) -> bytes:

@@ -17,12 +17,10 @@ from typing_extensions import (

     Buffer,

     NamedTuple,

     NotRequired,

-    TypeAlias,

     TypedDict,

     deprecated,

     get_overloads,

     overload,

-    runtime_checkable,

 )

 if TYPE_CHECKING:

@@ -1140,63 +1138,3 @@ class BuiltinSSHAgentSocketProvider(str, enum.Enum):

     __str__ = str.__str__

     __format__ = str.__format__  # type: ignore[assignment]

-

-

-@runtime_checkable

-class SSHAgentSocket(Protocol):

-    """An abstract networking socket connected to an SSH agent.

-

-    The abstract socket supports the [`sendall`][socket.socket.sendall]

-    and a [`recv`][socket.socket.recv] operation, with the same

-    signatures and semantics as for "real" sockets.  The abstract socket

-    also supports use as a context manager, for automatically closing

-    the socket upon exiting the context.

-

-    """

-

-    def __enter__(self) -> Any: ...  # noqa: ANN401

-

-    # mypy/typeshed has a *very* lax annotation of

-    # socket.socket.__exit__, which we need to be compatible with.

-    # *sigh*

-    def __exit__(

-        self,

-        *args: object,

-    ) -> bool | None: ...

-

-    def sendall(self, data: Buffer, flags: int = 0, /) -> None: ...

-

-    def recv(self, bufsize: int, flags: int = 0, /) -> bytes: ...

-

-

-SSHAgentSocketProvider: TypeAlias = "Callable[[], SSHAgentSocket]"

-"""A callable that provides an SSH agent socket."""

-

-

-class SSHAgentSocketProviderEntry(NamedTuple):

-    """Registry information for the table of SSH agent socket providers.

-

-    Third-party developers can register new socket providers for

-    auto-discovery by setting up an entry point named

-    [`derivepassphrase.ssh_agent_socket_providers`][derivepassphrase.ssh_agent.socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME],

-    referencing an instance of this class.  Upon startup of the `vault`

-    subsystem, `derivepassphrase` will then add appropriate entries to

-    the registry.

-

-    Attributes:

-        provider: The callable that provides the socket.

-        key: The table key which this entry is registered as.

-        aliases: Other keys that shall point to this entry's key.

-

-    Note:

-        The socket provider registry table uses the key as the key, and

-        the provider as the value. It does not store this info object

-        directly.

-

-    """

-

-    provider: SSHAgentSocketProvider

-    """"""

-    key: str

-    """"""

-    aliases: tuple[str, ...]

@@ -14,6 +14,7 @@ from typing import TYPE_CHECKING, ClassVar, overload

 from typing_extensions import Never, Self, assert_type

+import derivepassphrase_sshagentsocketprovider as d_sasp

 from derivepassphrase import _types

 if sys.version_info < (3, 11):

@@ -171,7 +172,7 @@ class SSHAgentClient:

     """

-    _connection: _types.SSHAgentSocket

+    _connection: d_sasp.SSHAgentSocket

     SOCKET_PROVIDERS: ClassVar = ("native",)

     """

     The default list of SSH agent socket providers.

@@ -181,7 +182,7 @@ class SSHAgentClient:

         self,

         /,

         *,

-        socket: _types.SSHAgentSocket | Sequence[str] | None = None,

+        socket: d_sasp.SSHAgentSocket | Sequence[str] | None = None,

     ) -> None:

         """Initialize the client.

@@ -251,7 +252,7 @@ class SSHAgentClient:

                 socket = self.SOCKET_PROVIDERS

             assert isinstance(socket, Sequence)  # for the type checker

             excs: list[NotImplementedError] = []

-            providers: list[_types.SSHAgentSocketProvider] = []

+            providers: list[d_sasp.SSHAgentSocketProvider] = []

             for candidate in socket:

                 try:

                     provider = socketprovider.SocketProvider.resolve(candidate)

@@ -275,7 +276,7 @@ class SSHAgentClient:

                     if excs

                     else NotImplementedError(msg)

                 )

-        elif isinstance(socket, _types.SSHAgentSocket):

+        elif isinstance(socket, d_sasp.SSHAgentSocket):

             self._connection = socket

         else:  # pragma: no cover [failsafe]

             assert_type(socket, Never)

@@ -439,7 +440,7 @@ class SSHAgentClient:

     def ensure_agent_subcontext(

         cls,

         conn: SSHAgentClient

-        | _types.SSHAgentSocket

+        | d_sasp.SSHAgentSocket

         | Sequence[str]

         | None = None,

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

@@ -486,7 +487,7 @@ class SSHAgentClient:

             with contextlib.nullcontext():

                 yield conn

         elif (

-            isinstance(conn, (_types.SSHAgentSocket, str, Sequence))

+            isinstance(conn, (d_sasp.SSHAgentSocket, str, Sequence))

             or conn is None

         ):

             with SSHAgentClient(socket=conn) as client:

@@ -27,6 +27,7 @@ from ctypes.wintypes import (  # type: ignore[attr-defined]

 )

 from typing import TYPE_CHECKING, cast

+import derivepassphrase_sshagentsocketprovider as d_sasp

 from derivepassphrase import _types

 if TYPE_CHECKING:

@@ -45,7 +46,7 @@ if TYPE_CHECKING:

     )

     SSHAgentSocketProviderT = TypeVar(

-        "SSHAgentSocketProviderT", bound=_types.SSHAgentSocketProvider

+        "SSHAgentSocketProviderT", bound=d_sasp.SSHAgentSocketProvider

     )

     """A parametrized SSH agent socket provider."""

@@ -759,7 +760,7 @@ class SocketProvider:

         return cls._windows_named_pipe(None)

     registry: ClassVar[

-        dict[str, _types.SSHAgentSocketProvider | str | None]

+        dict[str, d_sasp.SSHAgentSocketProvider | str | None]

     ] = {}

     """A dictionary of callables that provide SSH agent sockets.

@@ -850,8 +851,8 @@ class SocketProvider:

     @classmethod

     def lookup(

-        cls, provider: _types.SSHAgentSocketProvider | str | None, /

-    ) -> _types.SSHAgentSocketProvider | None:

+        cls, provider: d_sasp.SSHAgentSocketProvider | str | None, /

+    ) -> d_sasp.SSHAgentSocketProvider | None:

         """Look up a socket provider entry.

         Args:

@@ -876,8 +877,8 @@ class SocketProvider:

     @classmethod

     def resolve(

-        cls, provider: _types.SSHAgentSocketProvider | str | None, /

-    ) -> _types.SSHAgentSocketProvider:

+        cls, provider: d_sasp.SSHAgentSocketProvider | str | None, /

+    ) -> d_sasp.SSHAgentSocketProvider:

         """Resolve a socket provider to a proper callable.

         Args:

@@ -925,10 +926,10 @@ class SocketProvider:

         })

         canonical: dict[str, str] = {}

         sorter: graphlib.TopologicalSorter[

-            _types.SSHAgentSocketProvider | str | None

+            d_sasp.SSHAgentSocketProvider | str | None

         ] = graphlib.TopologicalSorter()

-        k: _types.SSHAgentSocketProvider | str | None

-        v: _types.SSHAgentSocketProvider | str | None

+        k: d_sasp.SSHAgentSocketProvider | str | None

+        v: d_sasp.SSHAgentSocketProvider | str | None

         for k, v in cls.registry.items():

             sorter.add(k, v)

         sorter.prepare()

@@ -956,14 +957,6 @@ class SocketProvider:

             for k, v in itertools.groupby(sorted_entries, key=by_value)

         }

-    ENTRY_POINT_GROUP_NAME = "derivepassphrase.ssh_agent_socket_providers"

-    """

-    The group name under which [entry

-    points][importlib.metadata.entry_points] for the SSH agent socket

-    provider registry should be recorded.  Each target of such an entry

-    point should be a [`_types.SSHAgentSocketProviderEntry`][] object.

-    """

-

     @classmethod

     def _find_all_ssh_agent_socket_providers(cls) -> None:

         """Find and load all declared SSH agent socket providers.

@@ -988,10 +981,10 @@ class SocketProvider:

         origins: dict[str, str | None] = {}

         entries = collections.ChainMap({}, cls.registry)

         for entry_point in importlib.metadata.entry_points(

-            group=cls.ENTRY_POINT_GROUP_NAME

+            group=d_sasp.ENTRY_POINT_GROUP_NAME

         ):

             provider_entry = cast(

-                "_types.SSHAgentSocketProviderEntry", entry_point.load()

+                "d_sasp.SSHAgentSocketProviderEntry", entry_point.load()

             )

             key = provider_entry.key

             value = entry_point.value

@@ -1004,7 +997,7 @@ class SocketProvider:

             if not callable(provider_entry.provider):

                 msg = (

                     f"Not an SSHAgentSocketProvider: "

-                    f"{dist = }, {cls.ENTRY_POINT_GROUP_NAME = }, "

+                    f"{dist = }, {d_sasp.ENTRY_POINT_GROUP_NAME = }, "

                     f"{value = }, {provider_entry = }"

                 )

                 raise AssertionError(msg)  # noqa: TRY004

@@ -16,13 +16,15 @@ from typing import TYPE_CHECKING, Final

 from typing_extensions import TypeAlias, assert_type

-from derivepassphrase import _types, sequin, ssh_agent

+from derivepassphrase import sequin, ssh_agent

 if TYPE_CHECKING:

     from collections.abc import Callable, Sequence

     from typing_extensions import Buffer

+    import derivepassphrase_sshagentsocketprovider as d_sasp

+

 class Vault:

     """A work-alike of James Coglan's vault.

@@ -517,7 +519,7 @@ class Vault:

         /,

         *,

         conn: ssh_agent.SSHAgentClient

-        | _types.SSHAgentSocket

+        | d_sasp.SSHAgentSocket

         | Sequence[str]

         | None = None,

     ) -> bytes:

@@ -27,6 +27,8 @@ from tests.machinery import pytest as pytest_machinery

 if TYPE_CHECKING:

     from collections.abc import Generator, Sequence

+    import derivepassphrase_sshagentsocketprovider as d_sasp

+

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

@@ -171,7 +173,7 @@ class SSHAgentInterfaceFunc(Protocol):

         self,

         executable: str | None,

         env: dict[str, Any],

-    ) -> tuple[_types.SSHAgentSocket, str] | None:

+    ) -> tuple[d_sasp.SSHAgentSocket, str] | None:

         """Interface the SSH agent.

         Args:

@@ -319,7 +321,7 @@ def spawn_noop(  # pragma: no cover [unused]

 def interface_pageant_on_the_annoying_os(

     executable: str | None,

     env: dict[str, Any],

-) -> tuple[_types.SSHAgentSocket, str] | None:  # pragma: no cover [external]

+) -> tuple[d_sasp.SSHAgentSocket, str] | None:  # pragma: no cover [external]

     """Interface a Pageant instance on The Annoying OS, if possible.

     Args:

@@ -346,7 +348,7 @@ def interface_pageant_on_the_annoying_os(

 def interface_openssh_agent_on_the_annoying_os(

     executable: str | None,

     env: dict[str, Any],

-) -> tuple[_types.SSHAgentSocket, str] | None:  # pragma: no cover [external]

+) -> tuple[d_sasp.SSHAgentSocket, str] | None:  # pragma: no cover [external]

     """Interface an OpenSSH agent instance on The Annoying OS, if possible.

     Args:

@@ -778,7 +780,7 @@ def spawn_named_agent(  # noqa: C901

             not isinstance(proc_or_socket_data, subprocess.Popen)

             and proc_or_socket_data is not None

         ):

-            socket: _types.SSHAgentSocket

+            socket: d_sasp.SSHAgentSocket

             socket, ssh_auth_sock = proc_or_socket_data

             monkeypatch.setenv("SSH_AUTH_SOCK", ssh_auth_sock)

             client = exit_stack.enter_context(

@@ -30,6 +30,7 @@ from typing import TYPE_CHECKING, cast

 from typing_extensions import NamedTuple, assert_never

+import derivepassphrase_sshagentsocketprovider as d_sasp

 from derivepassphrase import _types, ssh_agent, vault

 from derivepassphrase.ssh_agent import socketprovider

@@ -533,7 +534,7 @@ class RunningSSHAgentInfo(NamedTuple):

     """

-    socket: str | type[_types.SSHAgentSocket]

+    socket: str | type[d_sasp.SSHAgentSocket]

     """"""

     agent_type: KnownSSHAgentType

     """"""

@@ -661,7 +662,7 @@ class VaultTestConfig(NamedTuple):

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

-ssh_auth_sock_on_posix_entry = _types.SSHAgentSocketProviderEntry(

+ssh_auth_sock_on_posix_entry = d_sasp.SSHAgentSocketProviderEntry(

     socketprovider.SocketProvider.resolve(

         _types.BuiltinSSHAgentSocketProvider.SSH_AUTH_SOCK_ON_POSIX

     ),

@@ -673,7 +674,7 @@ The standard [`_types.SSHAgentSocketProviderEntry`][] for the UNIX

 domain socket handler on POSIX systems.

 """

-ssh_auth_sock_on_windows_entry = _types.SSHAgentSocketProviderEntry(

+ssh_auth_sock_on_windows_entry = d_sasp.SSHAgentSocketProviderEntry(

     socketprovider.SocketProvider.resolve(

         _types.BuiltinSSHAgentSocketProvider.SSH_AUTH_SOCK_ON_WINDOWS

     ),

@@ -685,7 +686,7 @@ The standard [`_types.SSHAgentSocketProviderEntry`][] for the Windows

 named pipe handler on The Annoying Operating System.

 """

-faulty_entry_callable = _types.SSHAgentSocketProviderEntry(

+faulty_entry_callable = d_sasp.SSHAgentSocketProviderEntry(

     (),  # type: ignore[arg-type]

     "tuple",

     (),

@@ -695,7 +696,7 @@ A faulty [`_types.SSHAgentSocketProviderEntry`][]: the indicated handler

 is not a callable.

 """

-faulty_entry_name_exists = _types.SSHAgentSocketProviderEntry(

+faulty_entry_name_exists = d_sasp.SSHAgentSocketProviderEntry(

     socketprovider.SocketProvider.resolve(

         _types.BuiltinSSHAgentSocketProvider.WINDOWS

     ),

@@ -707,7 +708,7 @@ A faulty [`_types.SSHAgentSocketProviderEntry`][]: the indicated handler

 is already registered with a different callable.

 """

-faulty_entry_alias_exists = _types.SSHAgentSocketProviderEntry(

+faulty_entry_alias_exists = d_sasp.SSHAgentSocketProviderEntry(

     socketprovider.SocketProvider.resolve(

         _types.BuiltinSSHAgentSocketProvider.SSH_AUTH_SOCK_ON_POSIX

     ),

@@ -20,6 +20,7 @@ import shlex

 import stat

 from typing import TYPE_CHECKING

+import derivepassphrase_sshagentsocketprovider as d_sasp

 import tests.data

 from derivepassphrase import _types, ssh_agent, vault

@@ -159,18 +160,18 @@ def phrase_from_key(

 # ===============================================

-def provider_entry_provider() -> _types.SSHAgentSocket:  # pragma: no cover

+def provider_entry_provider() -> d_sasp.SSHAgentSocket:  # pragma: no cover

     """A pseudo provider for a [`_types.SSHAgentSocketProviderEntry`][]."""

     msg = "We are not supposed to be called!"

     raise AssertionError(msg)

-provider_entry1 = _types.SSHAgentSocketProviderEntry(

+provider_entry1 = d_sasp.SSHAgentSocketProviderEntry(

     provider_entry_provider, "entry1", ("entry1a", "entry1b", "entry1c")

 )

 """A sample [`_types.SSHAgentSocketProviderEntry`][]."""

-provider_entry2 = _types.SSHAgentSocketProviderEntry(

+provider_entry2 = d_sasp.SSHAgentSocketProviderEntry(

     provider_entry_provider, "entry2", ("entry2d", "entry2e")

 )

@@ -51,6 +51,8 @@ if TYPE_CHECKING:

     from typing_extensions import Any

+    import derivepassphrase_sshagentsocketprovider as d_sasp

+

 # Marks

 # =====

@@ -623,7 +625,7 @@ def ensure_singleton_client_if_non_reentrant_agent(

         def ensure_agent_subcontext(

             conn: ssh_agent.SSHAgentClient

-            | _types.SSHAgentSocket

+            | d_sasp.SSHAgentSocket

             | Sequence[str]

             | None = None,

         ) -> contextlib.AbstractContextManager[ssh_agent.SSHAgentClient]:

@@ -44,6 +44,8 @@ if TYPE_CHECKING:

     from typing_extensions import Any

+    import derivepassphrase_sshagentsocketprovider as d_sasp

+

 DUMMY_SERVICE = data.DUMMY_SERVICE

 DUMMY_PASSPHRASE = data.DUMMY_PASSPHRASE

@@ -1154,7 +1156,7 @@ class TestMisc:

                 "list_keys",

                 callables.list_keys,

             )

-            hint: ssh_agent.SSHAgentClient | _types.SSHAgentSocket | None

+            hint: ssh_agent.SSHAgentClient | d_sasp.SSHAgentSocket | None

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

             # matching.

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

@@ -28,6 +28,8 @@ if TYPE_CHECKING:

     from collections.abc import Generator

     from typing import NoReturn

+    import derivepassphrase_sshagentsocketprovider as d_sasp

+

 DUMMY_SERVICE = data.DUMMY_SERVICE

 DUMMY_PASSPHRASE = data.DUMMY_PASSPHRASE

 DUMMY_CONFIG_SETTINGS = data.DUMMY_CONFIG_SETTINGS

@@ -578,7 +580,7 @@ class TestKeyBasic:

             },

         },

         main_config_str: str | None = None,

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

+        registry: dict[str, d_sasp.SSHAgentSocketProvider | str | None]

         | None = None,

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

         runner = machinery.CliRunner(mix_stderr=False)

@@ -647,7 +649,7 @@ class TestKeyBasic:

             "services": {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS}

         },

         main_config_str: str | None = None,

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

+        registry: dict[str, d_sasp.SSHAgentSocketProvider | str | None]

         | None = None,

         multiline: bool = False,

         input: str | bytes | None = None,

@@ -684,11 +686,11 @@ class TestKeyBasic:

 @pytest.fixture

 def provider_registry() -> dict[

-    str, _types.SSHAgentSocketProvider | str | None

+    str, d_sasp.SSHAgentSocketProvider | str | None

 ]:

     """Set up a controlled SSH agent socket provider registry."""

-    def err() -> _types.SSHAgentSocket:

+    def err() -> d_sasp.SSHAgentSocket:

         pytest.fail("Attempting to use the wrong SSH agent socket provider!")

     return {

@@ -722,7 +724,7 @@ class TestKeyExplicitSSHAgentSocketProvider(TestKeyBasic):

     def test_explicit_ssh_agent_socket_provider(

         self,

         provider_registry: dict[

-            str, _types.SSHAgentSocketProvider | str | None

+            str, d_sasp.SSHAgentSocketProvider | str | None

         ],

         config: _types.VaultConfig,

         on_command_line: bool,

@@ -748,7 +750,7 @@ class TestKeyExplicitSSHAgentSocketProvider(TestKeyBasic):

     def test_explicit_ssh_agent_socket_provider_not_found(

         self,

         provider_registry: dict[

-            str, _types.SSHAgentSocketProvider | str | None

+            str, d_sasp.SSHAgentSocketProvider | str | None

         ],

         config: _types.VaultConfig,

         on_command_line: bool,

@@ -19,6 +19,7 @@ import pytest

 from hypothesis import strategies

 from typing_extensions import TypeAlias

+import derivepassphrase_sshagentsocketprovider as d_sasp

 from derivepassphrase import _types, ssh_agent, vault

 from derivepassphrase._internals import cli_helpers

 from derivepassphrase.ssh_agent import socketprovider

@@ -49,7 +50,7 @@ class Parametrize(pytest_machinery.Parametrize):

                 [

                     importlib.metadata.EntryPoint(

                         name=data.faulty_entry_callable.key,

-                        group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,

+                        group=d_sasp.ENTRY_POINT_GROUP_NAME,

                         value="tests.data: faulty_entry_callable",

                     ),

                 ],

@@ -59,7 +60,7 @@ class Parametrize(pytest_machinery.Parametrize):

                 [

                     importlib.metadata.EntryPoint(

                         name=data.faulty_entry_name_exists.key,

-                        group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,

+                        group=d_sasp.ENTRY_POINT_GROUP_NAME,

                         value="tests.data: faulty_entry_name_exists",

                     ),

                 ],

@@ -69,7 +70,7 @@ class Parametrize(pytest_machinery.Parametrize):

                 [

                     importlib.metadata.EntryPoint(

                         name=data.faulty_entry_alias_exists.key,

-                        group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,

+                        group=d_sasp.ENTRY_POINT_GROUP_NAME,

                         value="tests.data: faulty_entry_alias_exists",

                     ),

                 ],

@@ -84,12 +85,12 @@ class Parametrize(pytest_machinery.Parametrize):

                 [

                     importlib.metadata.EntryPoint(

                         name=data.ssh_auth_sock_on_posix_entry.key,

-                        group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,

+                        group=d_sasp.ENTRY_POINT_GROUP_NAME,

                         value="tests.data: ssh_auth_sock_on_posix_entry",

                     ),

                     importlib.metadata.EntryPoint(

                         name=data.ssh_auth_sock_on_windows_entry.key,

-                        group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,

+                        group=d_sasp.ENTRY_POINT_GROUP_NAME,

                         value="tests.data: ssh_auth_sock_on_windows_entry",

                     ),

                 ],

@@ -99,12 +100,12 @@ class Parametrize(pytest_machinery.Parametrize):

                 [

                     importlib.metadata.EntryPoint(

                         name=callables.provider_entry1.key,

-                        group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,

+                        group=d_sasp.ENTRY_POINT_GROUP_NAME,

                         value="tests.data.callables: provider_entry1",

                     ),

                     importlib.metadata.EntryPoint(

                         name=callables.provider_entry2.key,

-                        group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,

+                        group=d_sasp.ENTRY_POINT_GROUP_NAME,

                         value="tests.data.callables: provider_entry2",

                     ),

                 ],

@@ -439,7 +440,7 @@ class Strategies:

     @staticmethod

     def io_operations_on_handles() -> strategies.SearchStrategy[

-        Callable[[_types.SSHAgentSocket], Any]

+        Callable[[d_sasp.SSHAgentSocket], Any]

     ]:

         """Return an I/O operation on an SSH agent socket."""

         return strategies.one_of(

@@ -753,7 +754,7 @@ class TestSSHAgentSocketProviderRegistry:

             pytest.fail("Native SSH agent socket provider is unavailable?!")

         # TODO(the-13th-letter): Rewrite using structural pattern matching.

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

-        target: _types.SSHAgentSocketProvider | str | None = (

+        target: d_sasp.SSHAgentSocketProvider | str | None = (

             None

             if terminal == "unimplemented"

             else _types.BuiltinSSHAgentSocketProvider.NATIVE

@@ -823,8 +824,8 @@ class TestSSHAgentSocketProviderRegistry:

         register = socketprovider.SocketProvider.register

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

-            current: _types.SSHAgentSocketProvider | str | None = name

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

+            current: d_sasp.SSHAgentSocketProvider | str | None = name

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

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

                 yield current

                 seen.add(current)

@@ -889,7 +890,7 @@ class TestSSHAgentSocketProviderRegistry:

     ) -> None:

         """Registering new entries works."""

-        def socket_provider() -> _types.SSHAgentSocket:

+        def socket_provider() -> d_sasp.SSHAgentSocket:

             raise AssertionError

         names = ["spam", "ham", "eggs", "parrot"]

@@ -7,6 +7,7 @@

 from __future__ import annotations

 import contextlib

+from typing import TYPE_CHECKING

 import pytest

 from hypothesis import stateful, strategies

@@ -15,6 +16,9 @@ from derivepassphrase import _types

 from derivepassphrase.ssh_agent import socketprovider

 from tests.machinery import pytest as pytest_machinery

+if TYPE_CHECKING:

+    import derivepassphrase_sshagentsocketprovider as d_sasp

+

 # All tests in this module are heavy-duty tests.

 pytestmark = [pytest_machinery.heavy_duty]

@@ -146,7 +150,7 @@ class SSHAgentSocketProviderRegistryStateMachine(

         )

         self.orig_registry = socketprovider.SocketProvider.registry

         self.registry: dict[

-            str, _types.SSHAgentSocketProvider | str | None

+            str, d_sasp.SSHAgentSocketProvider | str | None

         ] = {

             _types.BuiltinSSHAgentSocketProvider.SSH_AUTH_SOCK_ON_POSIX: (

                 self.orig_registry[

@@ -176,14 +180,14 @@ class SSHAgentSocketProviderRegistryStateMachine(

         self.monkeypatch.setattr(

             socketprovider.SocketProvider, "registry", self.registry

         )

-        self.model: dict[str, _types.SSHAgentSocketProvider | None] = {}

+        self.model: dict[str, d_sasp.SSHAgentSocketProvider | None] = {}

     known_keys: stateful.Bundle[str] = stateful.Bundle("known_keys")

     """"""

     new_keys: stateful.Bundle[str] = stateful.Bundle("new_keys")

     """"""

-    def sample_provider(self) -> _types.SSHAgentSocket:

+    def sample_provider(self) -> d_sasp.SSHAgentSocket:

         raise AssertionError

     @stateful.initialize(