!squash

Author: tony

libtmux/session.py

@@ -7,6 +7,10 @@
 import logging
 import os
 import typing as t
+from typing import Any, Dict, List, Optional, Union
+
+from libtmux.common import tmux_cmd
+from libtmux.window import Window
 
 from . import exc, formats
 from .common import (
@@ -24,6 +28,7 @@
 
 if t.TYPE_CHECKING:
     from .pane import Pane
+    from .server import Server
 
 
 class Session(TmuxMappingObject, TmuxRelationalObject, EnvironmentMixin):
@@ -54,7 +59,7 @@ class Session(TmuxMappingObject, TmuxRelationalObject, EnvironmentMixin):
     #: namespace used :class:`~libtmux.common.TmuxMappingObject`
     formatter_prefix = "session_"
 
-    def __init__(self, server=None, **kwargs):
+    def __init__(self, server: Optional["Server"] = None, **kwargs) -> None:
         EnvironmentMixin.__init__(self)
         self.server = server
 
@@ -64,7 +69,7 @@ def __init__(self, server=None, **kwargs):
         self.server._update_windows()
 
     @property
-    def _info(self):
+    def _info(self) -> Dict[str, str]:
 
         attrs = {"session_id": str(self._session_id)}
 
@@ -84,7 +89,7 @@ def by(val) -> bool:
         except IndexError as e:
             logger.error(e)
 
-    def cmd(self, *args, **kwargs):
+    def cmd(self, *args, **kwargs) -> tmux_cmd:
         """
         Return :meth:`server.cmd`.
 
@@ -173,11 +178,11 @@ def rename_session(self, new_name: str) -> "Session":
 
     def new_window(
         self,
-        window_name=None,
-        start_directory=None,
-        attach=True,
-        window_index="",
-        window_shell=None,
+        window_name: Optional[str] = None,
+        start_directory: None = None,
+        attach: bool = True,
+        window_index: str = "",
+        window_shell: None = None,
     ) -> Window:
         """
         Return :class:`Window` from ``$ tmux new-window``.
@@ -255,7 +260,7 @@ def new_window(
 
         return window
 
-    def kill_window(self, target_window=None):
+    def kill_window(self, target_window: Optional[str] = None) -> None:
         """Close a tmux window, and all panes inside it, ``$ tmux kill-window``
 
         Kill the current window or the window at ``target-window``. removing it
@@ -374,7 +379,9 @@ def attached_pane(self) -> t.Optional["Pane"]:
 
         return self.attached_window.attached_pane
 
-    def set_option(self, option, value, _global=False):
+    def set_option(
+        self, option: str, value: Union[int, str], _global: bool = False
+    ) -> None:
         """
         Set option ``$ tmux set-option <option> <value>``.
 
@@ -417,7 +424,9 @@ def set_option(self, option, value, _global=False):
         if isinstance(proc.stderr, list) and len(proc.stderr):
             handle_option_error(proc.stderr[0])
 
-    def show_options(self, option=None, _global=False):
+    def show_options(
+        self, option: Optional[str] = None, _global: bool = False
+    ) -> Union[int, Dict[str, str], Dict[str, Union[str, int]]]:
         """
         Return a dict of options for the window.
 
@@ -462,7 +471,7 @@ def show_options(self, option=None, _global=False):
 
         return session_options
 
-    def show_option(self, option, _global=False):
+    def show_option(self, option: str, _global: bool = False) -> Optional[int]:
         """Return a list of options for the window.
 
         Parameters

libtmux/test.py

@@ -8,6 +8,7 @@
 from typing import Callable, Optional
 
 from .exc import WaitTimeout
+from libtmux.server import Server
 
 logger = logging.getLogger(__name__)
 
@@ -17,13 +18,13 @@
 
 
 class RandomStrSequence:
-    def __init__(self, characters: str = "abcdefghijklmnopqrstuvwxyz0123456789_"):
+    def __init__(self, characters: str = "abcdefghijklmnopqrstuvwxyz0123456789_") -> None:
         self.characters: str = characters
 
     def __iter__(self):
         return self
 
-    def __next__(self):
+    def __next__(self) -> str:
         return "".join(random.sample(self.characters, k=8))
 
 
@@ -119,7 +120,7 @@ def retry_until(
     return True
 
 
-def get_test_session_name(server, prefix=TEST_SESSION_PREFIX):
+def get_test_session_name(server: Server, prefix: str=TEST_SESSION_PREFIX) -> str:
     """
     Faker to create a session name that doesn't exist.