!squash more

Author: tony

libtmux/session.py

@@ -82,9 +82,7 @@ def by(val: SessionDict) -> bool:
                     return False
             return True
 
-        # TODO add type hint
         target_sessions = [s for s in self.server._sessions if by(s)]
-        # target_sessions = list(filter(by, self.server._sessions))
         try:
             return target_sessions[0]
         except IndexError as e:

libtmux/window.py

@@ -18,6 +18,7 @@
     PaneDict,
     TmuxMappingObject,
     TmuxRelationalObject,
+    WindowDict,
     WindowOptionDict,
     handle_option_error,
 )
@@ -58,16 +59,13 @@ class Window(TmuxMappingObject, TmuxRelationalObject):
     session: "Session"
     """:class:`libtmux.Session` window is linked to"""
 
-    def __init__(self, session: "Session", **kwargs) -> None:
+    def __init__(self, session: "Session", window_id: str, **kwargs: t.Any) -> None:
         self.session = session
         self.server = self.session.server
 
-        if "window_id" not in kwargs:
-            raise ValueError("Window requires a `window_id`")
+        self._window_id = window_id
 
-        self._window_id = kwargs["window_id"]
-
-    def __repr__(self):
+    def __repr__(self) -> str:
         return "{}({} {}:{}, {})".format(
             self.__class__.__name__,
             self.id,
@@ -77,11 +75,11 @@ def __repr__(self):
         )
 
     @property
-    def _info(self) -> Dict[str, str]:
+    def _info(self) -> WindowDict:
         attrs = {"window_id": self._window_id}
 
         # from https://github.com/serkanyersen/underscore.py
-        def by(val) -> bool:
+        def by(val: WindowDict) -> bool:
             for key in attrs.keys():
                 try:
                     if attrs[key] != val[key]:
@@ -90,16 +88,15 @@ def by(val) -> bool:
                     return False
             return True
 
-        # TODO add type hint
-        target_windows = list(filter(by, self.server._windows))
+        target_windows = [s for s in self.server._windows if by(s)]
         # If a window_shell option was configured which results in
         # a short-lived process, the window id is @0.  Use that instead of
         # self._window_id
         if len(target_windows) == 0 and self.server._windows[0]["window_id"] == "@0":
             target_windows = self.server._windows
         return target_windows[0]
 
-    def cmd(self, cmd: str, *args, **kwargs) -> tmux_cmd:
+    def cmd(self, cmd: str, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
         """Return :meth:`Server.cmd` defaulting ``target_window`` as target.
 
         Send command to tmux with :attr:`window_id` as ``target-window``.
@@ -217,25 +214,28 @@ def show_window_options(self, g: Optional[bool] = False) -> WindowOptionDict:
         -------
         dict
         """
-
-        tmux_args = tuple()
+        tmux_args: t.Tuple[str, ...] = tuple()
 
         if g:
             tmux_args += ("-g",)
 
         tmux_args += ("show-window-options",)
-        cmd = self.cmd(*tmux_args).stdout
+        cmd = self.cmd(*tmux_args)
+
+        output = cmd.stdout
 
         # The shlex.split function splits the args at spaces, while also
         # retaining quoted sub-strings.
         #   shlex.split('this is "a test"') => ['this', 'is', 'a test']
-        cmd = [tuple(shlex.split(item)) for item in cmd]
 
-        window_options: WindowOptionDict = dict(cmd)
+        window_options: WindowOptionDict = {}
+        for item in output:
+            key, val = shlex.split(item)
+            assert isinstance(key, str)
+            assert isinstance(val, str)
 
-        for key, value in window_options.items():
-            if value.isdigit():
-                window_options[key] = int(value)
+            if isinstance(val, str) and val.isdigit():
+                window_options[key] = int(val)
 
         return window_options