Window: Use OptionMixin for show_option(s)

Author: tony

src/libtmux/window.py

@@ -13,12 +13,12 @@
 
 from libtmux._internal.query_list import QueryList
 from libtmux.common import has_gte_version, tmux_cmd
-from libtmux.constants import OPTION_SCOPE_FLAG_MAP, OptionScope
+from libtmux.constants import OptionScope
 from libtmux.neo import Obj, fetch_obj, fetch_objs
 from libtmux.pane import Pane
 
 from . import exc
-from .common import OptionMixin, PaneDict, WindowOptionDict, handle_option_error
+from .common import OptionMixin, PaneDict, WindowOptionDict
 from .formats import FORMAT_SEPARATOR
 
 if t.TYPE_CHECKING:
@@ -358,94 +358,6 @@ def show_window_options(self, g: t.Optional[bool] = False) -> "WindowOptionDict"
             scope=OptionScope.Window,
         )
 
-    @t.overload
-    def show_options(
-        self,
-        g: t.Optional[bool],
-        scope: t.Optional[OptionScope],
-        include_hooks: t.Optional[bool],
-        include_parents: t.Optional[bool],
-        values_only: t.Literal[True],
-    ) -> t.List[str]:
-        ...
-
-    @t.overload
-    def show_options(
-        self,
-        g: t.Optional[bool],
-        scope: t.Optional[OptionScope],
-        include_hooks: t.Optional[bool],
-        include_parents: t.Optional[bool],
-        values_only: t.Literal[None] = None,
-    ) -> "WindowOptionDict":
-        ...
-
-    @t.overload
-    def show_options(
-        self,
-        g: t.Optional[bool] = None,
-        scope: t.Optional[OptionScope] = None,
-        include_hooks: t.Optional[bool] = None,
-        include_parents: t.Optional[bool] = None,
-        values_only: t.Literal[False] = False,
-    ) -> "WindowOptionDict":
-        ...
-
-    def show_options(
-        self,
-        g: t.Optional[bool] = False,
-        scope: t.Optional[OptionScope] = OptionScope.Window,
-        include_hooks: t.Optional[bool] = None,
-        include_parents: t.Optional[bool] = None,
-        values_only: t.Optional[bool] = False,
-    ) -> t.Union["WindowOptionDict", t.List[str]]:
-        """Return a dict of options for the window.
-
-        Parameters
-        ----------
-        g : str, optional
-            Pass ``-g`` flag for global variable, default False.
-        """
-        tmux_args: t.Tuple[str, ...] = ()
-
-        if g:
-            tmux_args += ("-g",)
-
-        if scope is not None:
-            assert scope in OPTION_SCOPE_FLAG_MAP
-            tmux_args += (OPTION_SCOPE_FLAG_MAP[scope],)
-
-        if include_parents is not None and include_parents:
-            tmux_args += ("-A",)
-
-        if include_hooks is not None and include_hooks:
-            tmux_args += ("-H",)
-
-        if values_only is not None and values_only:
-            tmux_args += ("-v",)
-
-        cmd = self.cmd("show-options", *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']
-
-        window_options: "WindowOptionDict" = {}
-        for item in output:
-            try:
-                key, val = shlex.split(item)
-            except ValueError:
-                logger.exception(f"Error extracting option: {item}")
-            assert isinstance(key, str)
-            assert isinstance(val, str)
-
-            if isinstance(val, str) and val.isdigit():
-                window_options[key] = int(val)
-
-        return window_options
-
     def show_window_option(
         self,
         option: str,
@@ -465,64 +377,6 @@ def show_window_option(
             scope=OptionScope.Window,
         )
 
-    def show_option(
-        self,
-        option: str,
-        g: bool = False,
-        scope: t.Optional[OptionScope] = OptionScope.Window,
-        include_hooks: t.Optional[bool] = None,
-        include_parents: t.Optional[bool] = None,
-    ) -> t.Optional[t.Union[str, int]]:
-        """Return option value for the target window.
-
-        todo: test and return True/False for on/off string
-
-        Parameters
-        ----------
-        option : str
-        g : bool, optional
-            Pass ``-g`` flag, global. Default False.
-
-        Raises
-        ------
-        :exc:`exc.OptionError`, :exc:`exc.UnknownOption`,
-        :exc:`exc.InvalidOption`, :exc:`exc.AmbiguousOption`
-        """
-        tmux_args: t.Tuple[t.Union[str, int], ...] = ()
-
-        if g:
-            tmux_args += ("-g",)
-
-        if scope is not None:
-            assert scope in OPTION_SCOPE_FLAG_MAP
-            tmux_args += (OPTION_SCOPE_FLAG_MAP[scope],)
-
-        if include_parents is not None and include_parents:
-            tmux_args += ("-A",)
-
-        if include_hooks is not None and include_hooks:
-            tmux_args += ("-H",)
-
-        tmux_args += (option,)
-
-        cmd = self.cmd("show-options", *tmux_args)
-
-        if len(cmd.stderr):
-            handle_option_error(cmd.stderr[0])
-
-        window_options_output = cmd.stdout
-
-        if not len(window_options_output):
-            return None
-
-        value_raw = next(shlex.split(item) for item in window_options_output)
-
-        value: t.Union[str, int] = (
-            int(value_raw[1]) if value_raw[1].isdigit() else value_raw[1]
-        )
-
-        return value
-
     def rename_window(self, new_name: str) -> "Window":
         """Rename window.
 
@@ -541,8 +395,6 @@ def rename_window(self, new_name: str) -> "Window":
         >>> window.rename_window('New name')
         Window(@1 1:New name, Session($1 ...))
         """
-        import shlex
-
         lex = shlex.shlex(new_name)
         lex.escape = " "
         lex.whitespace_split = False