refactor(typing): Narrow t.Any to specific types across codebase

src/libtmux/exc.py

@@ -151,7 +151,7 @@ class WaitTimeout(LibTmuxException):
 class VariableUnpackingError(LibTmuxException):
     """Error unpacking variable."""
 
-    def __init__(self, variable: t.Any | None = None, *args: object) -> None:
+    def __init__(self, variable: object | None = None, *args: object) -> None:
         return super().__init__(f"Unexpected variable: {variable!s}")
 
 

src/libtmux/hooks.py

@@ -50,7 +50,7 @@
 if t.TYPE_CHECKING:
     from typing_extensions import Self
 
-HookDict = dict[str, t.Any]
+HookDict = dict[str, int | str]
 HookValues = dict[int, str] | SparseArray[str] | list[str]
 
 logger = logging.getLogger(__name__)

src/libtmux/pane.py

@@ -2388,7 +2388,7 @@ def split_window(
             version="0.33.0",
         )
 
-    def get(self, key: str, default: t.Any | None = None) -> t.Any:
+    def get(self, key: str, default: object | None = None) -> object:
         """Return key-based lookup. Deprecated by attributes.
 
         .. deprecated:: 0.17
@@ -2403,7 +2403,7 @@ def get(self, key: str, default: t.Any | None = None) -> t.Any:
             version="0.17.0",
         )
 
-    def __getitem__(self, key: str) -> t.Any:
+    def __getitem__(self, key: str) -> object:
         """Return item lookup by key. Deprecated in favor of attributes.
 
         .. deprecated:: 0.17

src/libtmux/pytest_plugin.py

@@ -59,6 +59,19 @@ def _reap_test_server(socket_name: str | None) -> None:
         socket_path.unlink(missing_ok=True)
 
 
+class SessionParams(t.TypedDict, total=False):
+    """Keyword arguments for :meth:`libtmux.Server.new_session` in tests."""
+
+    kill_session: bool
+    attach: bool
+    start_directory: os.PathLike[str] | str | None
+    window_name: str | None
+    window_command: str | None
+    x: int | t.Literal["-"] | None
+    y: int | t.Literal["-"] | None
+    environment: dict[str, str] | None
+
+
 @pytest.fixture(scope="session")
 def home_path(tmp_path_factory: pytest.TempPathFactory) -> pathlib.Path:
     """Temporary `/home/` path."""
@@ -184,7 +197,7 @@ def fin() -> None:
 
 
 @pytest.fixture
-def session_params() -> dict[str, t.Any]:
+def session_params() -> SessionParams:
     """Return default session creation parameters.
 
     >>> import pytest
@@ -224,7 +237,7 @@ def session_params() -> dict[str, t.Any]:
 @pytest.fixture
 def session(
     request: pytest.FixtureRequest,
-    session_params: dict[str, t.Any],
+    session_params: SessionParams,
     server: Server,
 ) -> Session:
     """Return new, temporary :class:`libtmux.Session`.

src/libtmux/server.py

@@ -2654,7 +2654,7 @@ def get_by_id(self, session_id: str) -> Session | None:
             version="0.16.0",
         )
 
-    def where(self, kwargs: dict[str, t.Any]) -> list[Session]:
+    def where(self, kwargs: dict[str, object]) -> list[Session]:
         """Filter through sessions, return list of :class:`Session`.
 
         .. deprecated:: 0.17
@@ -2668,7 +2668,7 @@ def where(self, kwargs: dict[str, t.Any]) -> list[Session]:
             version="0.17.0",
         )
 
-    def find_where(self, kwargs: dict[str, t.Any]) -> Session | None:
+    def find_where(self, kwargs: dict[str, object]) -> Session | None:
         """Filter through sessions, return first :class:`Session`.
 
         .. deprecated:: 0.17

src/libtmux/session.py

@@ -986,7 +986,7 @@ def kill_session(self) -> None:
             version="0.30.0",
         )
 
-    def get(self, key: str, default: t.Any | None = None) -> t.Any:
+    def get(self, key: str, default: object | None = None) -> object:
         """Return key-based lookup. Deprecated by attributes.
 
         .. deprecated:: 0.17
@@ -1001,7 +1001,7 @@ def get(self, key: str, default: t.Any | None = None) -> t.Any:
             version="0.17.0",
         )
 
-    def __getitem__(self, key: str) -> t.Any:
+    def __getitem__(self, key: str) -> object:
         """Return item lookup by key. Deprecated in favor of attributes.
 
         .. deprecated:: 0.17
@@ -1030,7 +1030,7 @@ def get_by_id(self, session_id: str) -> Window | None:
             version="0.16.0",
         )
 
-    def where(self, kwargs: dict[str, t.Any]) -> list[Window]:
+    def where(self, kwargs: dict[str, object]) -> list[Window]:
         """Filter through windows, return list of :class:`Window`.
 
         .. deprecated:: 0.17
@@ -1044,7 +1044,7 @@ def where(self, kwargs: dict[str, t.Any]) -> list[Window]:
             version="0.17.0",
         )
 
-    def find_where(self, kwargs: dict[str, t.Any]) -> Window | None:
+    def find_where(self, kwargs: dict[str, object]) -> Window | None:
         """Filter through windows, return first :class:`Window`.
 
         .. deprecated:: 0.17

src/libtmux/test/temporary.py

@@ -9,8 +9,11 @@
 
 if t.TYPE_CHECKING:
     import sys
-    from collections.abc import Generator
 
+    from typing_extensions import Unpack
+
+    from libtmux._internal.types import StrPath
+    from libtmux.constants import WindowDirection
     from libtmux.server import Server
     from libtmux.session import Session
     from libtmux.window import Window
@@ -19,12 +22,107 @@
         pass
 
 
+class TempSessionParams(t.TypedDict, total=False):
+    """Keyword arguments for :func:`temp_session`."""
+
+    session_name: str | None
+    kill_session: bool
+    attach: bool
+    start_directory: StrPath | None
+    window_name: str | None
+    window_command: str | None
+    x: int | t.Literal["-"] | None
+    y: int | t.Literal["-"] | None
+    environment: dict[str, str] | None
+
+
+class TempSessionKwargs(t.TypedDict, total=False):
+    """Keyword arguments forwarded to :meth:`Server.new_session`."""
+
+    kill_session: bool
+    attach: bool
+    start_directory: StrPath | None
+    window_name: str | None
+    window_command: str | None
+    x: int | t.Literal["-"] | None
+    y: int | t.Literal["-"] | None
+    environment: dict[str, str] | None
+
+
+class TempWindowParams(t.TypedDict, total=False):
+    """Keyword arguments for :func:`temp_window`."""
+
+    window_name: str | None
+    start_directory: StrPath | None
+    attach: bool
+    window_index: str
+    window_shell: str | None
+    environment: dict[str, str] | None
+    direction: WindowDirection | None
+    target_window: str | None
+
+
+class TempWindowKwargs(t.TypedDict, total=False):
+    """Keyword arguments forwarded to :meth:`Session.new_window`."""
+
+    start_directory: StrPath | None
+    attach: bool
+    window_index: str
+    window_shell: str | None
+    environment: dict[str, str] | None
+    direction: WindowDirection | None
+    target_window: str | None
+
+
 @contextlib.contextmanager
+def _temp_session(
+    server: Server,
+    *args: t.Any,
+    **kwargs: object,
+) -> t.Iterator[Session]:
+    kwargs_typed = t.cast("TempSessionParams", dict(kwargs))
+    if "session_name" in kwargs_typed:
+        session_name = kwargs_typed["session_name"]
+    else:
+        session_name = get_test_session_name(server)
+    kwargs_no_name = t.cast(
+        "TempSessionKwargs",
+        {k: v for k, v in kwargs_typed.items() if k != "session_name"},
+    )
+
+    session = server.new_session(
+        session_name,
+        *args,
+        **kwargs_no_name,
+    )
+
+    try:
+        yield session
+    finally:
+        if isinstance(session_name, str) and server.has_session(session_name):
+            session.kill()
+
+
+@t.overload
+def temp_session(
+    server: Server,
+    **kwargs: Unpack[TempSessionParams],
+) -> contextlib.AbstractContextManager[Session]: ...
+
+
+@t.overload
 def temp_session(
     server: Server,
     *args: t.Any,
-    **kwargs: t.Any,
-) -> Generator[Session, t.Any, t.Any]:
+    **kwargs: object,
+) -> contextlib.AbstractContextManager[Session]: ...
+
+
+def temp_session(
+    server: Server,
+    *args: t.Any,
+    **kwargs: object,
+) -> contextlib.AbstractContextManager[Session]:
     """
     Return a context manager with a temporary session.
 
@@ -55,27 +153,63 @@ def temp_session(
     ...     session.new_window(window_name='my window')
     Window(@3 2:my window, Session($... ...))
     """
-    if "session_name" in kwargs:
-        session_name = kwargs.pop("session_name")
+    return _temp_session(server, *args, **kwargs)
+
+
+@contextlib.contextmanager
+def _temp_window(
+    session: Session,
+    *args: t.Any,
+    **kwargs: object,
+) -> t.Iterator[Window]:
+    kwargs_typed = t.cast("TempWindowParams", dict(kwargs))
+    if "window_name" in kwargs_typed:
+        window_name = kwargs_typed["window_name"]
     else:
-        session_name = get_test_session_name(server)
+        window_name = get_test_window_name(session)
+    kwargs_no_name = t.cast(
+        "TempWindowKwargs",
+        {k: v for k, v in kwargs_typed.items() if k != "window_name"},
+    )
 
-    session = server.new_session(session_name, *args, **kwargs)
+    window = session.new_window(
+        window_name,
+        *args,
+        **kwargs_no_name,
+    )
+
+    # Get ``window_id`` before returning it, it may be killed within context.
+    window_id = window.window_id
+    assert window_id is not None
+    assert isinstance(window_id, str)
 
     try:
-        yield session
+        yield window
     finally:
-        if server.has_session(session_name):
-            session.kill()
-    return
+        if len(session.windows.filter(window_id=window_id)) > 0:
+            window.kill()
 
 
-@contextlib.contextmanager
+@t.overload
+def temp_window(
+    session: Session,
+    **kwargs: Unpack[TempWindowParams],
+) -> contextlib.AbstractContextManager[Window]: ...
+
+
+@t.overload
 def temp_window(
     session: Session,
     *args: t.Any,
-    **kwargs: t.Any,
-) -> Generator[Window, t.Any, t.Any]:
+    **kwargs: object,
+) -> contextlib.AbstractContextManager[Window]: ...
+
+
+def temp_window(
+    session: Session,
+    *args: t.Any,
+    **kwargs: object,
+) -> contextlib.AbstractContextManager[Window]:
     """
     Return a context manager with a temporary window.
 
@@ -112,21 +246,4 @@ def temp_window(
     ...     window.split()
     Pane(%4 Window(@3 2:libtmux_..., Session($1 libtmux_...)))
     """
-    if "window_name" not in kwargs:
-        window_name = get_test_window_name(session)
-    else:
-        window_name = kwargs.pop("window_name")
-
-    window = session.new_window(window_name, *args, **kwargs)
-
-    # Get ``window_id`` before returning it, it may be killed within context.
-    window_id = window.window_id
-    assert window_id is not None
-    assert isinstance(window_id, str)
-
-    try:
-        yield window
-    finally:
-        if len(session.windows.filter(window_id=window_id)) > 0:
-            window.kill()
-    return
+    return _temp_window(session, *args, **kwargs)

src/libtmux/window.py

@@ -1547,7 +1547,7 @@ def show_window_option(
             global_=g,
         )
 
-    def get(self, key: str, default: t.Any | None = None) -> t.Any:
+    def get(self, key: str, default: object | None = None) -> object:
         """Return key-based lookup. Deprecated by attributes.
 
         .. deprecated:: 0.17
@@ -1562,7 +1562,7 @@ def get(self, key: str, default: t.Any | None = None) -> t.Any:
             version="0.17.0",
         )
 
-    def __getitem__(self, key: str) -> t.Any:
+    def __getitem__(self, key: str) -> object:
         """Return item lookup by key. Deprecated in favor of attributes.
 
         .. deprecated:: 0.17
@@ -1591,7 +1591,7 @@ def get_by_id(self, pane_id: str) -> Pane | None:
             version="0.16.0",
         )
 
-    def where(self, kwargs: dict[str, t.Any]) -> list[Pane]:
+    def where(self, kwargs: dict[str, object]) -> list[Pane]:
         """Filter through panes, return list of :class:`Pane`.
 
         .. deprecated:: 0.17
@@ -1605,7 +1605,7 @@ def where(self, kwargs: dict[str, t.Any]) -> list[Pane]:
             version="0.17.0",
         )
 
-    def find_where(self, kwargs: dict[str, t.Any]) -> Pane | None:
+    def find_where(self, kwargs: dict[str, object]) -> Pane | None:
         """Filter through panes, return first :class:`Pane`.
 
         .. deprecated:: 0.17