!squash

Author: tony

libtmux/session.py

@@ -414,7 +414,6 @@ def set_option(
 
             Needs tests
         """
-
         if isinstance(value, bool) and value:
             value = "on"
         elif isinstance(value, bool) and not value:

libtmux/window.py

@@ -262,8 +262,7 @@ def show_window_option(
         :exc:`exc.OptionError`, :exc:`exc.UnknownOption`,
         :exc:`exc.InvalidOption`, :exc:`exc.AmbiguousOption`
         """
-
-        tmux_args = tuple()
+        tmux_args: t.Tuple[t.Union[str, int], ...] = tuple()
 
         if g:
             tmux_args += ("-g",)
@@ -275,15 +274,18 @@ def show_window_option(
         if len(cmd.stderr):
             handle_option_error(cmd.stderr[0])
 
-        if not len(cmd.stdout):
+        window_options_output = cmd.stdout
+
+        if not len(window_options_output):
             return None
 
-        option = [shlex.split(item) for item in cmd.stdout][0]
+        value_raw = [shlex.split(item) for item in window_options_output][0]
 
-        if option[1].isdigit():
-            option = (option[0], int(option[1]))
+        value: t.Union[str, int] = (
+            int(value_raw[1]) if value_raw[1].isdigit() else value_raw[1]
+        )
 
-        return option[1]
+        return value
 
     def rename_window(self, new_name: str) -> "Window":
         """
@@ -364,7 +366,7 @@ def select_window(self) -> "Window":
         """
         return self.session.select_window(self.index)
 
-    def select_pane(self, target_pane: int) -> t.Optional[Pane]:
+    def select_pane(self, target_pane: t.Union[str, int]) -> t.Optional[Pane]:
         """
         Return selected :class:`Pane` through ``$ tmux select-pane``.
 
@@ -453,7 +455,7 @@ def split_window(
 
         # '-t%s' % self.attached_pane.get('pane_id'),
         # 2013-10-18 LOOK AT THIS, rm'd it..
-        tmux_args: t.Tuple = tuple()
+        tmux_args: t.Tuple[str, ...] = tuple()
 
         if target:
             tmux_args += ("-t%s" % target,)
@@ -481,23 +483,25 @@ def split_window(
         if shell:
             tmux_args += (shell,)
 
-        pane = self.cmd("split-window", *tmux_args)
+        pane_cmd = self.cmd("split-window", *tmux_args)
 
         # tmux < 1.7. This is added in 1.7.
-        if pane.stderr:
-            if "pane too small" in pane.stderr:
-                raise exc.LibTmuxException(pane.stderr)
+        if pane_cmd.stderr:
+            if "pane too small" in pane_cmd.stderr:
+                raise exc.LibTmuxException(pane_cmd.stderr)
 
-            raise exc.LibTmuxException(pane.stderr, self._info, self.panes)
-        else:
-            pane = pane.stdout[0]
+            raise exc.LibTmuxException(pane_cmd.stderr, self._info, self.panes)
+
+        pane_output = pane_cmd.stdout[0]
 
-            pane = dict(zip(pformats, pane.split(formats.FORMAT_SEPARATOR)))
+        pane_formatters = dict(
+            zip(pformats, pane_output.split(formats.FORMAT_SEPARATOR))
+        )
 
-            # clear up empty dict
-            pane = {k: v for k, v in pane.items() if v}
+        # Prune empty values
+        pane_formatters_filtered = {k: v for k, v in pane_formatters.items() if v}
 
-        return Pane(window=self, **pane)
+        return Pane(window=self, **pane_formatters_filtered)
 
     @property
     def attached_pane(self) -> t.Optional[Pane]: