From e2abc95e8d149ac2d71f0baacf821de5b3d394bf Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 06:48:59 -0600
Subject: [PATCH 01/16] docs(window,session): Remove inaccurate docstring
 comment

---
 src/libtmux/session.py | 3 ---
 src/libtmux/window.py  | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/src/libtmux/session.py b/src/libtmux/session.py
index 1b0969b21..d0487f87e 100644
--- a/src/libtmux/session.py
+++ b/src/libtmux/session.py
@@ -228,9 +228,6 @@ def show_options(
         """
         Return a dict of options for the window.
 
-        For familiarity with tmux, the option ``option`` param forwards to pick
-        a single option, forwarding to :meth:`Session.show_option`.
-
         Parameters
         ----------
         _global : bool, optional
diff --git a/src/libtmux/window.py b/src/libtmux/window.py
index 2d19eabc6..0e1c6e50e 100644
--- a/src/libtmux/window.py
+++ b/src/libtmux/window.py
@@ -366,9 +366,6 @@ def show_window_options(self, g: t.Optional[bool] = False) -> "WindowOptionDict"
         """
         Return a dict of options for the window.
 
-        For familiarity with tmux, the option ``option`` param forwards to
-        pick a single option, forwarding to :meth:`Window.show_window_option`.
-
         .. versionchanged:: 0.13.0
 
            ``option`` removed, use show_window_option to return an individual option.

From c8c01b021b556afd1e5706c6578b7123ac48fb61 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 06:40:26 -0600
Subject: [PATCH 02/16] chore: set_(window_)option: Fix docstring

---
 src/libtmux/session.py | 2 +-
 src/libtmux/window.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libtmux/session.py b/src/libtmux/session.py
index d0487f87e..b20c00f60 100644
--- a/src/libtmux/session.py
+++ b/src/libtmux/session.py
@@ -264,7 +264,7 @@ def show_options(
     def show_option(
         self, option: str, _global: bool = False
     ) -> t.Optional[t.Union[str, int, bool]]:
-        """Return a list of options for the window.
+        """Return option value for the target session.
 
         Parameters
         ----------
diff --git a/src/libtmux/window.py b/src/libtmux/window.py
index 0e1c6e50e..55a46eccf 100644
--- a/src/libtmux/window.py
+++ b/src/libtmux/window.py
@@ -404,7 +404,7 @@ def show_window_option(
         self, option: str, g: bool = False
     ) -> t.Optional[t.Union[str, int]]:
         """
-        Return a list of options for the window.
+        Return option value for the target window.
 
         todo: test and return True/False for on/off string
 

From f17f188dc4e8366b45382bdfae2529fb00d110b6 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 06:53:30 -0600
Subject: [PATCH 03/16] docs(Pane): Tighten docstrings

---
 src/libtmux/pane.py | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/libtmux/pane.py b/src/libtmux/pane.py
index c3c49a4f3..b73d01948 100644
--- a/src/libtmux/pane.py
+++ b/src/libtmux/pane.py
@@ -27,8 +27,7 @@
 
 @dataclasses.dataclass()
 class Pane(Obj):
-    """
-    A :term:`tmux(1)` :term:`Pane` [pane_manual]_.
+    """:term:`tmux(1)` :term:`Pane` [pane_manual]_.
 
     ``Pane`` instances can send commands directly to a pane, or traverse
     between linked tmux objects.
@@ -107,7 +106,7 @@ def session(self) -> "Session":
     """
 
     def cmd(self, cmd: str, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
-        """Return :meth:`Server.cmd` defaulting to ``target_pane`` as target.
+        """Execute tmux subcommand against target pane. See also: :meth:`Server.cmd`.
 
         Send command to tmux with :attr:`pane_id` as ``target-pane``.
 
@@ -124,8 +123,7 @@ def cmd(self, cmd: str, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
     """
 
     def resize_pane(self, *args: t.Any, **kwargs: t.Any) -> "Pane":
-        """
-        ``$ tmux resize-pane`` of pane and return ``self``.
+        """Resize tmux pane.
 
         Parameters
         ----------
@@ -161,8 +159,7 @@ def capture_pane(
         start: t.Union["t.Literal['-']", t.Optional[int]] = None,
         end: t.Union["t.Literal['-']", t.Optional[int]] = None,
     ) -> t.Union[str, t.List[str]]:
-        """
-        Capture text from pane.
+        """Capture text from pane.
 
         ``$ tmux capture-pane`` to pane.
         ``$ tmux capture-pane -S -10`` to pane.
@@ -259,8 +256,7 @@ def display_message(self, cmd: str, get_text: "t.Literal[False]") -> None:
     def display_message(
         self, cmd: str, get_text: bool = False
     ) -> t.Optional[t.Union[str, t.List[str]]]:
-        """
-        ``$ tmux display-message`` to the pane.
+        """Display message to pane.
 
         Displays a message in target-client status line.
 
@@ -286,8 +282,7 @@ def display_message(
     """
 
     def select_pane(self) -> "Pane":
-        """
-        Select pane. Return ``self``.
+        """Select pane.
 
         To select a window object asynchrously. If a ``pane`` object exists
         and is no longer longer the current window, ``w.select_pane()``
@@ -306,8 +301,7 @@ def split_window(
         start_directory: t.Optional[str] = None,
         percent: t.Optional[int] = None,
     ) -> "Pane":  # New Pane, not self
-        """
-        Split window at pane and return newly created :class:`Pane`.
+        """Split window at pane and return newly created :class:`Pane`.
 
         Parameters
         ----------
@@ -333,8 +327,7 @@ def split_window(
     """
 
     def set_width(self, width: int) -> "Pane":
-        """
-        Set width of pane.
+        """Set pane width.
 
         Parameters
         ----------
@@ -345,8 +338,7 @@ def set_width(self, width: int) -> "Pane":
         return self
 
     def set_height(self, height: int) -> "Pane":
-        """
-        Set height of pane.
+        """Set pane height.
 
         Parameters
         ----------
@@ -357,8 +349,7 @@ def set_height(self, height: int) -> "Pane":
         return self
 
     def enter(self) -> "Pane":
-        """
-        Send carriage return to pane.
+        """Send carriage return to pane.
 
         ``$ tmux send-keys`` send Enter to the pane.
         """

From 147132200f45b6286c055548d8063df035e2e7a6 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 06:57:35 -0600
Subject: [PATCH 04/16] docs(Window): Tighten and correct docstrings

---
 src/libtmux/window.py | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/libtmux/window.py b/src/libtmux/window.py
index 55a46eccf..79ce0abab 100644
--- a/src/libtmux/window.py
+++ b/src/libtmux/window.py
@@ -29,8 +29,7 @@
 
 @dataclasses.dataclass()
 class Window(Obj):
-    """
-    A :term:`tmux(1)` :term:`Window` [window_manual]_.
+    """:term:`tmux(1)` :term:`Window` [window_manual]_.
 
     Holds :class:`Pane` objects.
 
@@ -110,7 +109,7 @@ def session(self) -> "Session":
 
     @property
     def panes(self) -> QueryList["Pane"]:  # type: ignore
-        """Panes belonging windows.
+        """Panes contained by window.
 
         Can be accessed via
         :meth:`.panes.get() <libtmux._internal.query_list.QueryList.get()>` and
@@ -133,7 +132,7 @@ def panes(self) -> QueryList["Pane"]:  # type: ignore
     """
 
     def cmd(self, cmd: str, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
-        """Return :meth:`Server.cmd` defaulting to ``target_window`` as target.
+        """Execute tmux subcommand against target window. See :meth:`Server.cmd`.
 
         Send command to tmux with :attr:`window_id` as ``target-window``.
 
@@ -150,8 +149,9 @@ def cmd(self, cmd: str, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
     """
 
     def select_pane(self, target_pane: t.Union[str, int]) -> t.Optional["Pane"]:
-        """
-        Return selected :class:`Pane` through ``$ tmux select-pane``.
+        """Select pane and return selected :class:`Pane`.
+
+        ``$ tmux select-pane``.
 
         Parameters
         ----------
@@ -182,8 +182,7 @@ def split_window(
         percent: t.Optional[int] = None,
         environment: t.Optional[t.Dict[str, str]] = None,
     ) -> "Pane":
-        """
-        Split window and return the created :class:`Pane`.
+        """Split window and return the created :class:`Pane`.
 
         Used for splitting window and holding in a python object.
 
@@ -363,8 +362,7 @@ def set_window_option(self, option: str, value: t.Union[int, str]) -> "Window":
         return self
 
     def show_window_options(self, g: t.Optional[bool] = False) -> "WindowOptionDict":
-        """
-        Return a dict of options for the window.
+        """Return dict of options for window.
 
         .. versionchanged:: 0.13.0
 
@@ -403,8 +401,7 @@ def show_window_options(self, g: t.Optional[bool] = False) -> "WindowOptionDict"
     def show_window_option(
         self, option: str, g: bool = False
     ) -> t.Optional[t.Union[str, int]]:
-        """
-        Return option value for the target window.
+        """Return option value for the target window.
 
         todo: test and return True/False for on/off string
 
@@ -445,8 +442,7 @@ def show_window_option(
         return value
 
     def rename_window(self, new_name: str) -> "Window":
-        """
-        Return :class:`Window` object ``$ tmux rename-window <new_name>``.
+        """Rename window.
 
         Parameters
         ----------
@@ -492,8 +488,7 @@ def kill_window(self) -> None:
     def move_window(
         self, destination: str = "", session: t.Optional[str] = None
     ) -> "Window":
-        """
-        Move the current :class:`Window` object ``$ tmux move-window``.
+        """Move current :class:`Window` object ``$ tmux move-window``.
 
         Parameters
         ----------
@@ -525,8 +520,7 @@ def move_window(
     # Climbers
     #
     def select_window(self) -> "Window":
-        """
-        Select window. Return ``self``.
+        """Select window.
 
         To select a window object asynchrously. If a ``window`` object exists
         and is no longer longer the current window, ``w.select_window()``
@@ -540,7 +534,7 @@ def select_window(self) -> "Window":
     #
     @property
     def attached_pane(self) -> t.Optional["Pane"]:
-        """Return the attached :class:`Pane`."""
+        """Return attached :class:`Pane`."""
         for pane in self.panes:
             if pane.pane_active == "1":
                 return pane

From b514bb41ca7116ee78266d7e3cdfbd9778b0ced2 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 07:03:11 -0600
Subject: [PATCH 05/16] docs(Session): Tighten and correct docstrings

---
 src/libtmux/session.py | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/libtmux/session.py b/src/libtmux/session.py
index b20c00f60..78e579689 100644
--- a/src/libtmux/session.py
+++ b/src/libtmux/session.py
@@ -36,8 +36,7 @@
 
 @dataclasses.dataclass()
 class Session(Obj, EnvironmentMixin):
-    """
-    A :term:`tmux(1)` :term:`Session` [session_manual]_.
+    """:term:`tmux(1)` :term:`Session` [session_manual]_.
 
     Holds :class:`Window` objects.
 
@@ -97,7 +96,7 @@ def from_session_id(cls, server: "Server", session_id: str) -> "Session":
     #
     @property
     def windows(self) -> QueryList["Window"]:  # type:ignore
-        """Windows belonging session.
+        """Windows contained by session.
 
         Can be accessed via
         :meth:`.windows.get() <libtmux._internal.query_list.QueryList.get()>` and
@@ -117,7 +116,7 @@ def windows(self) -> QueryList["Window"]:  # type:ignore
 
     @property
     def panes(self) -> QueryList["Pane"]:  # type:ignore
-        """Panes belonging session.
+        """Panes contained by session's windows.
 
         Can be accessed via
         :meth:`.panes.get() <libtmux._internal.query_list.QueryList.get()>` and
@@ -139,8 +138,7 @@ def panes(self) -> QueryList["Pane"]:  # type:ignore
     # Command
     #
     def cmd(self, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
-        """
-        Return :meth:`server.cmd`.
+        """Execute tmux subcommand against target session. See :meth:`server.cmd`.
 
         Returns
         -------
@@ -173,8 +171,7 @@ def cmd(self, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
     def set_option(
         self, option: str, value: t.Union[str, int], _global: bool = False
     ) -> "Session":
-        """
-        Set option ``$ tmux set-option <option> <value>``.
+        """Set option ``$ tmux set-option <option> <value>``.
 
         Parameters
         ----------
@@ -225,8 +222,7 @@ def set_option(
     def show_options(
         self, _global: t.Optional[bool] = False
     ) -> t.Dict[str, t.Union[str, int]]:
-        """
-        Return a dict of options for the window.
+        """Return dict of options for the session.
 
         Parameters
         ----------
@@ -316,8 +312,7 @@ def show_option(
         return value
 
     def select_window(self, target_window: t.Union[str, int]) -> "Window":
-        """
-        Return :class:`Window` selected via ``$ tmux select-window``.
+        """Select window, return selected window.
 
         Parameters
         ----------
@@ -377,15 +372,14 @@ def attach_session(self) -> "Session":
         return self
 
     def kill_session(self) -> None:
-        """``$ tmux kill-session``."""
+        """Destroy session."""
         proc = self.cmd("kill-session", "-t%s" % self.session_id)
 
         if proc.stderr:
             raise exc.LibTmuxException(proc.stderr)
 
     def switch_client(self) -> "Session":
-        """
-        Switch client to this session.
+        """Switch client to session.
 
         Raises
         ------
@@ -399,8 +393,7 @@ def switch_client(self) -> "Session":
         return self
 
     def rename_session(self, new_name: str) -> "Session":
-        """
-        Rename session and return new :class:`Session` object.
+        """Rename session and return new :class:`Session` object.
 
         Parameters
         ----------
@@ -440,8 +433,7 @@ def new_window(
         window_shell: t.Optional[str] = None,
         environment: t.Optional[t.Dict[str, str]] = None,
     ) -> "Window":
-        """
-        Return :class:`Window` from ``$ tmux new-window``.
+        """Create new window, returns new :class:`Window`.
 
         By default, this will make the window active. For the new window
         to be created and not set to current, pass in ``attach=False``.

From 98496f0c77a03b2bef9831b93dcd43e03806a453 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 08:31:35 -0600
Subject: [PATCH 06/16] docs(Server): Tighten and correct docstrings

---
 src/libtmux/server.py | 41 ++++++++++++++++-------------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/libtmux/server.py b/src/libtmux/server.py
index b9861add4..cae6a03d3 100644
--- a/src/libtmux/server.py
+++ b/src/libtmux/server.py
@@ -1,4 +1,4 @@
-"""Pythonization of the :term:`tmux(1)` server.
+"""Wrapper for :term:`tmux(1)` server.
 
 libtmux.server
 ~~~~~~~~~~~~~~
@@ -38,8 +38,7 @@
 
 
 class Server(EnvironmentMixin):
-    """
-    The :term:`tmux(1)` :term:`Server` [server_manual]_.
+    """:term:`tmux(1)` :term:`Server` [server_manual]_.
 
     - :attr:`Server.sessions` [:class:`Session`, ...]
 
@@ -136,7 +135,7 @@ def __init__(
             self.colors = colors
 
     def is_alive(self) -> bool:
-        """If server alive or not.
+        """Return True if tmux server alive.
 
         >>> tmux = Server(socket_name="no_exist")
         >>> assert not tmux.is_alive()
@@ -175,8 +174,7 @@ def raise_if_dead(self) -> None:
     # Command
     #
     def cmd(self, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
-        """
-        Execute tmux command and return output.
+        """Execute tmux command, rsepective of socket name and file, return output.
 
         Examples
         --------
@@ -212,8 +210,7 @@ def cmd(self, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
 
     @property
     def attached_sessions(self) -> t.List[Session]:
-        """
-        Return active :class:`Session` objects.
+        """Return active :class:`Session`s.
 
         Examples
         --------
@@ -242,8 +239,7 @@ def attached_sessions(self) -> t.List[Session]:
         return attached_sessions
 
     def has_session(self, target_session: str, exact: bool = True) -> bool:
-        """
-        Return True if session exists. ``$ tmux has-session``.
+        """Return True if session exists.
 
         Parameters
         ----------
@@ -275,12 +271,11 @@ def has_session(self, target_session: str, exact: bool = True) -> bool:
         return False
 
     def kill_server(self) -> None:
-        """``$ tmux kill-server``."""
+        """Kill tmux server."""
         self.cmd("kill-server")
 
     def kill_session(self, target_session: t.Union[str, int]) -> "Server":
-        """
-        Kill the tmux session with ``$ tmux kill-session``, return ``self``.
+        """Kill tmux session.
 
         Parameters
         ----------
@@ -304,8 +299,7 @@ def kill_session(self, target_session: t.Union[str, int]) -> "Server":
         return self
 
     def switch_client(self, target_session: str) -> None:
-        """
-        ``$ tmux switch-client``.
+        """Switch tmux client.
 
         Parameters
         ----------
@@ -324,7 +318,7 @@ def switch_client(self, target_session: str) -> None:
             raise exc.LibTmuxException(proc.stderr)
 
     def attach_session(self, target_session: t.Optional[str] = None) -> None:
-        """``$ tmux attach-session`` aka alias: ``$ tmux attach``.
+        """Attach tmux session.
 
         Parameters
         ----------
@@ -359,8 +353,7 @@ def new_session(
         *args: t.Any,
         **kwargs: t.Any,
     ) -> Session:
-        """
-        Return :class:`Session` from  ``$ tmux new-session``.
+        """Create new session, returns new :class:`Session`.
 
         Uses ``-P`` flag to print session info, ``-F`` for return formatting
         returns new Session object.
@@ -498,7 +491,7 @@ def new_session(
     #
     @property
     def sessions(self) -> QueryList[Session]:  # type:ignore
-        """Sessions belonging server.
+        """Sessions contained in server.
 
         Can be accessed via
         :meth:`.sessions.get() <libtmux._internal.query_list.QueryList.get()>` and
@@ -519,7 +512,7 @@ def sessions(self) -> QueryList[Session]:  # type:ignore
 
     @property
     def windows(self) -> QueryList[Window]:  # type:ignore
-        """Windows belonging server.
+        """Windows contained in server's sessions.
 
         Can be accessed via
         :meth:`.windows.get() <libtmux._internal.query_list.QueryList.get()>` and
@@ -538,7 +531,7 @@ def windows(self) -> QueryList[Window]:  # type:ignore
 
     @property
     def panes(self) -> QueryList[Pane]:  # type:ignore
-        """Panes belonging server.
+        """Panes contained in tmux server (across all windows in all sessions).
 
         Can be accessed via
         :meth:`.panes.get() <libtmux._internal.query_list.QueryList.get()>` and
@@ -582,8 +575,7 @@ def __repr__(self) -> str:
     # Legacy: Redundant stuff we want to remove
     #
     def _list_panes(self) -> t.List[PaneDict]:
-        """
-        Return list of panes in :py:obj:`dict` form.
+        """Return list of panes in :py:obj:`dict` form.
 
         Retrieved from ``$ tmux(1) list-panes`` stdout.
 
@@ -599,8 +591,7 @@ def _list_panes(self) -> t.List[PaneDict]:
         return [p.__dict__ for p in self.panes]
 
     def _update_panes(self) -> "Server":
-        """
-        Update internal pane data and return ``self`` for chainability.
+        """Update internal pane data and return ``self`` for chainability.
 
         .. deprecated:: 0.16
 

From 56921d7f3adba7bf661f0757f748e57cf4eb89a9 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 08:33:13 -0600
Subject: [PATCH 07/16] docs(common): Tighten and correct docstrings

---
 src/libtmux/common.py | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/libtmux/common.py b/src/libtmux/common.py
index 81e5cb514..893c449ac 100644
--- a/src/libtmux/common.py
+++ b/src/libtmux/common.py
@@ -46,8 +46,7 @@ def __init__(self, add_option: Optional[str] = None) -> None:
         self._add_option = add_option
 
     def set_environment(self, name: str, value: str) -> None:
-        """
-        Set environment ``$ tmux set-environment <name> <value>``.
+        """Set environment ``$ tmux set-environment <name> <value>``.
 
         Parameters
         ----------
@@ -73,8 +72,7 @@ def set_environment(self, name: str, value: str) -> None:
             raise ValueError("tmux set-environment stderr: %s" % cmd.stderr)
 
     def unset_environment(self, name: str) -> None:
-        """
-        Unset environment variable ``$ tmux set-environment -u <name>``.
+        """Unset environment variable ``$ tmux set-environment -u <name>``.
 
         Parameters
         ----------
@@ -190,8 +188,7 @@ def getenv(self, name: str) -> Optional[t.Union[str, bool]]:
 
 
 class tmux_cmd:
-    """
-    :term:`tmux(1)` command via :py:mod:`subprocess`.
+    """:term:`tmux(1)` command via :py:mod:`subprocess`.
 
     Examples
     --------
@@ -264,8 +261,7 @@ def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
 
 
 def get_version() -> LooseVersion:
-    """
-    Return tmux version.
+    """Return tmux version.
 
     If tmux is built from git master, the version returned will be the latest
     version appended with -master, e.g. ``2.4-master``.
@@ -301,8 +297,7 @@ def get_version() -> LooseVersion:
 
 
 def has_version(version: str) -> bool:
-    """
-    Return affirmative if tmux version installed.
+    """Return True if tmux version installed.
 
     Parameters
     ----------
@@ -318,8 +313,7 @@ def has_version(version: str) -> bool:
 
 
 def has_gt_version(min_version: str) -> bool:
-    """
-    Return affirmative if tmux version greater than minimum.
+    """Return True if tmux version greater than minimum.
 
     Parameters
     ----------
@@ -335,8 +329,7 @@ def has_gt_version(min_version: str) -> bool:
 
 
 def has_gte_version(min_version: str) -> bool:
-    """
-    Return True if tmux version greater or equal to minimum.
+    """Return True if tmux version greater or equal to minimum.
 
     Parameters
     ----------
@@ -352,8 +345,7 @@ def has_gte_version(min_version: str) -> bool:
 
 
 def has_lte_version(max_version: str) -> bool:
-    """
-    Return True if tmux version less or equal to minimum.
+    """Return True if tmux version less or equal to minimum.
 
     Parameters
     ----------
@@ -369,8 +361,7 @@ def has_lte_version(max_version: str) -> bool:
 
 
 def has_lt_version(max_version: str) -> bool:
-    """
-    Return True if tmux version less than minimum.
+    """Return True if tmux version less than minimum.
 
     Parameters
     ----------
@@ -386,8 +377,7 @@ def has_lt_version(max_version: str) -> bool:
 
 
 def has_minimum_version(raises: bool = True) -> bool:
-    """
-    Return if tmux meets version requirement. Version >1.8 or above.
+    """Return True if tmux meets version requirement. Version >1.8 or above.
 
     Parameters
     ----------

From 0ae4e7c1d22a309ae019c3a8b85a0c9e62db0db4 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 07:06:13 -0600
Subject: [PATCH 08/16] ruff . --select COM --fix

---
 docs/conf.py                        |  2 +-
 src/libtmux/_internal/query_list.py |  2 +-
 src/libtmux/_vendor/version.py      | 10 +++++-----
 src/libtmux/common.py               | 12 ++++++------
 src/libtmux/exc.py                  |  4 ++--
 src/libtmux/neo.py                  |  4 ++--
 src/libtmux/pane.py                 |  4 ++--
 src/libtmux/pytest_plugin.py        |  2 +-
 src/libtmux/server.py               |  6 +++---
 src/libtmux/session.py              | 16 ++++++++--------
 src/libtmux/test.py                 |  8 ++++----
 src/libtmux/window.py               |  6 +++---
 tests/legacy_api/test_common.py     |  2 +-
 tests/legacy_api/test_pane.py       |  4 ++--
 tests/legacy_api/test_session.py    |  2 +-
 tests/legacy_api/test_tmuxobject.py | 10 +++++-----
 tests/legacy_api/test_window.py     |  4 ++--
 tests/test_common.py                |  2 +-
 tests/test_pane.py                  |  4 ++--
 tests/test_pytest_plugin.py         | 10 +++++-----
 tests/test_session.py               |  2 +-
 tests/test_tmuxobject.py            |  8 ++++----
 tests/test_window.py                |  4 ++--
 23 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index fbc808157..65adbd87c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -98,7 +98,7 @@
         "sidebar/navigation.html",
         "sidebar/projects.html",
         "sidebar/scroll-end.html",
-    ]
+    ],
 }
 
 # linkify_issues
diff --git a/src/libtmux/_internal/query_list.py b/src/libtmux/_internal/query_list.py
index 1113a0151..9e0e8600f 100644
--- a/src/libtmux/_internal/query_list.py
+++ b/src/libtmux/_internal/query_list.py
@@ -66,7 +66,7 @@ def keygetter(
 
 
 def parse_lookup(
-    obj: "Mapping[str, t.Any]", path: str, lookup: str
+    obj: "Mapping[str, t.Any]", path: str, lookup: str,
 ) -> t.Optional[t.Any]:
     """Check if field lookup key, e.g. "my__path__contains" has comparator, return val.
 
diff --git a/src/libtmux/_vendor/version.py b/src/libtmux/_vendor/version.py
index 82cfe5c04..889c2ac8f 100644
--- a/src/libtmux/_vendor/version.py
+++ b/src/libtmux/_vendor/version.py
@@ -33,12 +33,12 @@
     ],
 ]
 CmpKey = Tuple[
-    int, Tuple[int, ...], PrePostDevType, PrePostDevType, PrePostDevType, LocalType
+    int, Tuple[int, ...], PrePostDevType, PrePostDevType, PrePostDevType, LocalType,
 ]
 VersionComparisonMethod = Callable[[CmpKey, CmpKey], bool]
 
 _Version = collections.namedtuple(
-    "_Version", ["epoch", "release", "dev", "pre", "post", "local"]
+    "_Version", ["epoch", "release", "dev", "pre", "post", "local"],
 )
 
 
@@ -220,7 +220,7 @@ def __init__(self, version: str) -> None:
             release=tuple(int(i) for i in match.group("release").split(".")),
             pre=_parse_letter_version(match.group("pre_l"), match.group("pre_n")),
             post=_parse_letter_version(
-                match.group("post_l"), match.group("post_n1") or match.group("post_n2")
+                match.group("post_l"), match.group("post_n1") or match.group("post_n2"),
             ),
             dev=_parse_letter_version(match.group("dev_l"), match.group("dev_n")),
             local=_parse_local_version(match.group("local")),
@@ -468,7 +468,7 @@ def micro(self) -> int:
 
 
 def _parse_letter_version(
-    letter: str, number: Union[str, bytes, SupportsInt]
+    letter: str, number: Union[str, bytes, SupportsInt],
 ) -> Optional[Tuple[str, int]]:
     if letter:
         # We consider there to be an implicit 0 in a pre-release if there is
@@ -529,7 +529,7 @@ def _cmpkey(
     # re-reverse it back into the correct order and make it a tuple and use
     # that for our sorting key.
     _release = tuple(
-        reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release))))
+        reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release)))),
     )
 
     # We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
diff --git a/src/libtmux/common.py b/src/libtmux/common.py
index 893c449ac..c17b32ef4 100644
--- a/src/libtmux/common.py
+++ b/src/libtmux/common.py
@@ -228,7 +228,7 @@ def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
 
         try:
             self.process = subprocess.Popen(
-                cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+                cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
             )
             stdout, stderr = self.process.communicate()
             returncode = self.process.returncode
@@ -255,8 +255,8 @@ def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
 
         logger.debug(
             "self.stdout for {cmd}: {stdout}".format(
-                cmd=" ".join(cmd), stdout=self.stdout
-            )
+                cmd=" ".join(cmd), stdout=self.stdout,
+            ),
         )
 
 
@@ -281,7 +281,7 @@ def get_version() -> LooseVersion:
                 return LooseVersion("%s-openbsd" % TMUX_MAX_VERSION)
             raise exc.LibTmuxException(
                 "libtmux supports tmux %s and greater. This system"
-                " is running tmux 1.3 or earlier." % TMUX_MIN_VERSION
+                " is running tmux 1.3 or earlier." % TMUX_MIN_VERSION,
             )
         raise exc.VersionTooLow(proc.stderr)
 
@@ -409,8 +409,8 @@ def has_minimum_version(raises: bool = True) -> bool:
             raise exc.VersionTooLow(
                 "libtmux only supports tmux {} and greater. This system"
                 " has {} installed. Upgrade your tmux to use libtmux.".format(
-                    TMUX_MIN_VERSION, get_version()
-                )
+                    TMUX_MIN_VERSION, get_version(),
+                ),
             )
         else:
             return False
diff --git a/src/libtmux/exc.py b/src/libtmux/exc.py
index bf35a73f4..2b9e53e7c 100644
--- a/src/libtmux/exc.py
+++ b/src/libtmux/exc.py
@@ -38,7 +38,7 @@ def __init__(
         if all(arg is not None for arg in [obj_key, obj_id, list_cmd, list_extra_args]):
             return super().__init__(
                 f"Could not find {obj_key}={obj_id} for {list_cmd} "
-                f'{list_extra_args if list_extra_args is not None else ""}'
+                f'{list_extra_args if list_extra_args is not None else ""}',
             )
         return super().__init__("Could not find object")
 
@@ -51,7 +51,7 @@ class BadSessionName(LibTmuxException):
     """Disallowed session name for tmux (empty, contains periods or colons)."""
 
     def __init__(
-        self, reason: str, session_name: t.Optional[str] = None, *args: object
+        self, reason: str, session_name: t.Optional[str] = None, *args: object,
     ):
         msg = f"Bad session name: {reason}"
         if session_name is not None:
diff --git a/src/libtmux/neo.py b/src/libtmux/neo.py
index 3ad975e7d..1f290783e 100644
--- a/src/libtmux/neo.py
+++ b/src/libtmux/neo.py
@@ -170,7 +170,7 @@ def _refresh(
     ) -> None:
         assert isinstance(obj_id, str)
         obj = fetch_obj(
-            obj_key=obj_key, obj_id=obj_id, list_cmd=list_cmd, server=self.server
+            obj_key=obj_key, obj_id=obj_id, list_cmd=list_cmd, server=self.server,
         )
         assert obj is not None
         if obj is not None:
@@ -233,7 +233,7 @@ def fetch_obj(
 ) -> OutputRaw:
     """Fetch raw data from tmux command."""
     obj_formatters_filtered = fetch_objs(
-        server=server, list_cmd=list_cmd, list_extra_args=list_extra_args
+        server=server, list_cmd=list_cmd, list_extra_args=list_extra_args,
     )
 
     obj = None
diff --git a/src/libtmux/pane.py b/src/libtmux/pane.py
index b73d01948..bec282ecf 100644
--- a/src/libtmux/pane.py
+++ b/src/libtmux/pane.py
@@ -245,7 +245,7 @@ def send_keys(
 
     @overload
     def display_message(
-        self, cmd: str, get_text: "t.Literal[True]"
+        self, cmd: str, get_text: "t.Literal[True]",
     ) -> t.Union[str, t.List[str]]:
         ...
 
@@ -254,7 +254,7 @@ def display_message(self, cmd: str, get_text: "t.Literal[False]") -> None:
         ...
 
     def display_message(
-        self, cmd: str, get_text: bool = False
+        self, cmd: str, get_text: bool = False,
     ) -> t.Optional[t.Union[str, t.List[str]]]:
         """Display message to pane.
 
diff --git a/src/libtmux/pytest_plugin.py b/src/libtmux/pytest_plugin.py
index 4fabf8174..6c8d9b78c 100644
--- a/src/libtmux/pytest_plugin.py
+++ b/src/libtmux/pytest_plugin.py
@@ -185,7 +185,7 @@ def session_params() -> t.Dict[str, t.Any]:
 
 @pytest.fixture(scope="function")
 def session(
-    request: pytest.FixtureRequest, session_params: t.Dict[str, t.Any], server: Server
+    request: pytest.FixtureRequest, session_params: t.Dict[str, t.Any], server: Server,
 ) -> "Session":
     """Return new, temporary :class:`libtmux.Session`.
 
diff --git a/src/libtmux/server.py b/src/libtmux/server.py
index cae6a03d3..6d676dff5 100644
--- a/src/libtmux/server.py
+++ b/src/libtmux/server.py
@@ -432,7 +432,7 @@ def new_session(
                     logger.info("session %s exists. killed it." % session_name)
                 else:
                     raise exc.TmuxSessionExists(
-                        "Session named %s exists" % session_name
+                        "Session named %s exists" % session_name,
                     )
 
         logger.debug(f"creating session {session_name}")
@@ -479,11 +479,11 @@ def new_session(
             os.environ["TMUX"] = env
 
         session_formatters = dict(
-            zip(["session_id"], session_stdout.split(formats.FORMAT_SEPARATOR))
+            zip(["session_id"], session_stdout.split(formats.FORMAT_SEPARATOR)),
         )
 
         return Session.from_session_id(
-            server=self, session_id=session_formatters["session_id"]
+            server=self, session_id=session_formatters["session_id"],
         )
 
     #
diff --git a/src/libtmux/session.py b/src/libtmux/session.py
index 78e579689..674094d1b 100644
--- a/src/libtmux/session.py
+++ b/src/libtmux/session.py
@@ -77,7 +77,7 @@ def refresh(self) -> None:
         """Refresh session attributes from tmux."""
         assert isinstance(self.session_id, str)
         return super()._refresh(
-            obj_key="session_id", obj_id=self.session_id, list_cmd="list-sessions"
+            obj_key="session_id", obj_id=self.session_id, list_cmd="list-sessions",
         )
 
     @classmethod
@@ -169,7 +169,7 @@ def cmd(self, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
     """
 
     def set_option(
-        self, option: str, value: t.Union[str, int], _global: bool = False
+        self, option: str, value: t.Union[str, int], _global: bool = False,
     ) -> "Session":
         """Set option ``$ tmux set-option <option> <value>``.
 
@@ -220,7 +220,7 @@ def set_option(
         return self
 
     def show_options(
-        self, _global: t.Optional[bool] = False
+        self, _global: t.Optional[bool] = False,
     ) -> t.Dict[str, t.Union[str, int]]:
         """Return dict of options for the session.
 
@@ -258,7 +258,7 @@ def show_options(
         return session_options
 
     def show_option(
-        self, option: str, _global: bool = False
+        self, option: str, _global: bool = False,
     ) -> t.Optional[t.Union[str, int, bool]]:
         """Return option value for the target session.
 
@@ -488,7 +488,7 @@ def new_window(
                     window_args += (f"-e{k}={v}",)
             else:
                 logger.warning(
-                    "Cannot set up environment as tmux 3.0 or newer is required."
+                    "Cannot set up environment as tmux 3.0 or newer is required.",
                 )
 
         if window_shell:
@@ -502,11 +502,11 @@ def new_window(
         window_output = cmd.stdout[0]
 
         window_formatters = dict(
-            zip(["window_id"], window_output.split(FORMAT_SEPARATOR))
+            zip(["window_id"], window_output.split(FORMAT_SEPARATOR)),
         )
 
         return Window.from_window_id(
-            server=self.server, window_id=window_formatters["window_id"]
+            server=self.server, window_id=window_formatters["window_id"],
         )
 
     def kill_window(self, target_window: t.Optional[str] = None) -> None:
@@ -604,7 +604,7 @@ def __getitem__(self, key: str) -> t.Any:
 
         """
         warnings.warn(
-            f"Item lookups, e.g. session['{key}'] is deprecated", stacklevel=2
+            f"Item lookups, e.g. session['{key}'] is deprecated", stacklevel=2,
         )
         return getattr(self, key)
 
diff --git a/src/libtmux/test.py b/src/libtmux/test.py
index dc99655ce..74bf17a37 100644
--- a/src/libtmux/test.py
+++ b/src/libtmux/test.py
@@ -28,7 +28,7 @@ class RandomStrSequence:
     """Factory to generate random string."""
 
     def __init__(
-        self, characters: str = "abcdefghijklmnopqrstuvwxyz0123456789_"
+        self, characters: str = "abcdefghijklmnopqrstuvwxyz0123456789_",
     ) -> None:
         """Create a random letter / number generator. 8 chars in length.
 
@@ -141,7 +141,7 @@ def get_test_session_name(server: "Server", prefix: str = TEST_SESSION_PREFIX) -
 
 
 def get_test_window_name(
-    session: "Session", prefix: t.Optional[str] = TEST_SESSION_PREFIX
+    session: "Session", prefix: t.Optional[str] = TEST_SESSION_PREFIX,
 ) -> str:
     """
     Faker to create a window name that doesn't exist.
@@ -180,7 +180,7 @@ def get_test_window_name(
 
 @contextlib.contextmanager
 def temp_session(
-    server: Server, *args: t.Any, **kwargs: t.Any
+    server: Server, *args: t.Any, **kwargs: t.Any,
 ) -> t.Generator["Session", t.Any, t.Any]:
     """
     Return a context manager with a temporary session.
@@ -230,7 +230,7 @@ def temp_session(
 
 @contextlib.contextmanager
 def temp_window(
-    session: "Session", *args: t.Any, **kwargs: t.Any
+    session: "Session", *args: t.Any, **kwargs: t.Any,
 ) -> t.Generator["Window", t.Any, t.Any]:
     """
     Return a context manager with a temporary window.
diff --git a/src/libtmux/window.py b/src/libtmux/window.py
index 79ce0abab..8ea4a7e57 100644
--- a/src/libtmux/window.py
+++ b/src/libtmux/window.py
@@ -258,7 +258,7 @@ def split_window(
                     tmux_args += (f"-e{k}={v}",)
             else:
                 logger.warning(
-                    "Cannot set up environment as tmux 3.0 or newer is required."
+                    "Cannot set up environment as tmux 3.0 or newer is required.",
                 )
 
         if shell:
@@ -399,7 +399,7 @@ def show_window_options(self, g: t.Optional[bool] = False) -> "WindowOptionDict"
         return window_options
 
     def show_window_option(
-        self, option: str, g: bool = False
+        self, option: str, g: bool = False,
     ) -> t.Optional[t.Union[str, int]]:
         """Return option value for the target window.
 
@@ -486,7 +486,7 @@ def kill_window(self) -> None:
             raise exc.LibTmuxException(proc.stderr)
 
     def move_window(
-        self, destination: str = "", session: t.Optional[str] = None
+        self, destination: str = "", session: t.Optional[str] = None,
     ) -> "Window":
         """Move current :class:`Window` object ``$ tmux move-window``.
 
diff --git a/tests/legacy_api/test_common.py b/tests/legacy_api/test_common.py
index 9067ac2bb..e5c8897a5 100644
--- a/tests/legacy_api/test_common.py
+++ b/tests/legacy_api/test_common.py
@@ -215,7 +215,7 @@ class SessionCheckName(t.NamedTuple):
     ],
 )
 def test_session_check_name(
-    session_name: t.Optional[str], raises: bool, exc_msg_regex: t.Optional[str]
+    session_name: t.Optional[str], raises: bool, exc_msg_regex: t.Optional[str],
 ) -> None:
     """Verify session_check_name()."""
     if raises:
diff --git a/tests/legacy_api/test_pane.py b/tests/legacy_api/test_pane.py
index 24b600b71..03dc167dd 100644
--- a/tests/legacy_api/test_pane.py
+++ b/tests/legacy_api/test_pane.py
@@ -83,9 +83,9 @@ def test_capture_pane(session: Session) -> None:
     pane_contents = "\n".join(pane.capture_pane())
     assert pane_contents == "$"
     pane.send_keys(
-        r'printf "\n%s\n" "Hello World !"', literal=True, suppress_history=False
+        r'printf "\n%s\n" "Hello World !"', literal=True, suppress_history=False,
     )
     pane_contents = "\n".join(pane.capture_pane())
     assert pane_contents == r'$ printf "\n%s\n" "Hello World !"{}'.format(
-        "\n\nHello World !\n$"
+        "\n\nHello World !\n$",
     )
diff --git a/tests/legacy_api/test_session.py b/tests/legacy_api/test_session.py
index 8d43c7abe..061287548 100644
--- a/tests/legacy_api/test_session.py
+++ b/tests/legacy_api/test_session.py
@@ -220,7 +220,7 @@ def test_unset_environment(session: Session) -> None:
     [("hey.period", True), ("hey:its a colon", True), ("hey moo", False)],
 )
 def test_periods_raise_badsessionname(
-    server: Server, session: Session, session_name: str, raises: bool
+    server: Server, session: Session, session_name: str, raises: bool,
 ) -> None:
     """Verify session names with periods raise BadSessionName."""
     new_name = session_name + "moo"  # used for rename / switch
diff --git a/tests/legacy_api/test_tmuxobject.py b/tests/legacy_api/test_tmuxobject.py
index c73e327ac..abf2cf03e 100644
--- a/tests/legacy_api/test_tmuxobject.py
+++ b/tests/legacy_api/test_tmuxobject.py
@@ -60,7 +60,7 @@ def test_find_where_multiple_infos(server: Server, session: Session) -> None:
         assert session_name is not None
 
         find_where = server.find_where(
-            {"session_id": session_id, "session_name": session_name}
+            {"session_id": session_id, "session_name": session_name},
         )
 
         assert find_where == session
@@ -74,7 +74,7 @@ def test_find_where_multiple_infos(server: Server, session: Session) -> None:
             assert window_index is not None
 
             find_where_window = session.find_where(
-                {"window_id": window_id, "window_index": window_index}
+                {"window_id": window_id, "window_index": window_index},
             )
 
             assert find_where_window == window
@@ -88,7 +88,7 @@ def test_find_where_multiple_infos(server: Server, session: Session) -> None:
                 assert pane_tty is not None
 
                 find_where_pane = window.find_where(
-                    {"pane_id": pane_id, "pane_tty": pane_tty}
+                    {"pane_id": pane_id, "pane_tty": pane_tty},
                 )
 
                 assert find_where_pane == pane
@@ -107,7 +107,7 @@ def test_where(server: Server, session: Session) -> None:
         assert session_name is not None
 
         server_sessions = server.where(
-            {"session_id": session_id, "session_name": session_name}
+            {"session_id": session_id, "session_name": session_name},
         )
 
         assert len(server_sessions) == 1
@@ -124,7 +124,7 @@ def test_where(server: Server, session: Session) -> None:
             assert window_index is not None
 
             session_windows = session.where(
-                {"window_id": window_id, "window_index": window_index}
+                {"window_id": window_id, "window_index": window_index},
             )
 
             assert len(session_windows) == 1
diff --git a/tests/legacy_api/test_window.py b/tests/legacy_api/test_window.py
index 90c4f2463..f3f968757 100644
--- a/tests/legacy_api/test_window.py
+++ b/tests/legacy_api/test_window.py
@@ -162,7 +162,7 @@ def test_split_window_horizontal(session: Session) -> None:
     [("test", "ha ha ha fjewlkjflwef"), ("test", "hello \\ wazzup 0")],
 )
 def test_window_rename(
-    session: Session, window_name_before: str, window_name_after: str
+    session: Session, window_name_before: str, window_name_after: str,
 ) -> None:
     """Test Window.rename_window()."""
     window_name_before = "test"
@@ -308,7 +308,7 @@ def test_select_layout_accepts_no_arg(server: Server, session: Session) -> None:
 
 
 @pytest.mark.skipif(
-    has_lt_version("3.2"), reason="needs filter introduced in tmux >= 3.2"
+    has_lt_version("3.2"), reason="needs filter introduced in tmux >= 3.2",
 )
 def test_empty_window_name(session: Session) -> None:
     """New windows can be created with empty string for window name."""
diff --git a/tests/test_common.py b/tests/test_common.py
index 9067ac2bb..e5c8897a5 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -215,7 +215,7 @@ class SessionCheckName(t.NamedTuple):
     ],
 )
 def test_session_check_name(
-    session_name: t.Optional[str], raises: bool, exc_msg_regex: t.Optional[str]
+    session_name: t.Optional[str], raises: bool, exc_msg_regex: t.Optional[str],
 ) -> None:
     """Verify session_check_name()."""
     if raises:
diff --git a/tests/test_pane.py b/tests/test_pane.py
index b44a1f617..a2953687c 100644
--- a/tests/test_pane.py
+++ b/tests/test_pane.py
@@ -87,11 +87,11 @@ def test_capture_pane(session: Session) -> None:
     pane_contents = "\n".join(pane.capture_pane())
     assert pane_contents == "$"
     pane.send_keys(
-        r'printf "\n%s\n" "Hello World !"', literal=True, suppress_history=False
+        r'printf "\n%s\n" "Hello World !"', literal=True, suppress_history=False,
     )
     pane_contents = "\n".join(pane.capture_pane())
     assert pane_contents == r'$ printf "\n%s\n" "Hello World !"{}'.format(
-        "\n\nHello World !\n$"
+        "\n\nHello World !\n$",
     )
 
 
diff --git a/tests/test_pytest_plugin.py b/tests/test_pytest_plugin.py
index 21a5b7241..9e0836475 100644
--- a/tests/test_pytest_plugin.py
+++ b/tests/test_pytest_plugin.py
@@ -17,7 +17,7 @@ def test_plugin(
             """
 [pytest]
 addopts=-vv
-        """.strip()
+        """.strip(),
         ),
     )
     pytester.makeconftest(
@@ -31,8 +31,8 @@ def setup(
     request: pytest.FixtureRequest,
 ) -> None:
     pass
-    """
-        )
+    """,
+        ),
     )
     tests_path = pytester.path / "tests"
     files = {
@@ -49,8 +49,8 @@ def test_repo_git_remote_checkout(
 
     new_window = session.new_window(attach=False, window_name="my window name")
     assert new_window.window_name == "my window name"
-        """
-        )
+        """,
+        ),
     }
     first_test_key = next(iter(files.keys()))
     first_test_filename = str(tests_path / first_test_key)
diff --git a/tests/test_session.py b/tests/test_session.py
index 64fc81570..5d515eabf 100644
--- a/tests/test_session.py
+++ b/tests/test_session.py
@@ -231,7 +231,7 @@ class PeriodRaisesBadSessionName(t.NamedTuple):
     ],
 )
 def test_periods_raise_bad_session_name(
-    server: Server, session: Session, session_name: str, raises: bool
+    server: Server, session: Session, session_name: str, raises: bool,
 ) -> None:
     """Verify session names with periods raise BadSessionName."""
     new_name = session_name + "moo"  # used for rename / switch
diff --git a/tests/test_tmuxobject.py b/tests/test_tmuxobject.py
index dd93929dd..08fe09aa7 100644
--- a/tests/test_tmuxobject.py
+++ b/tests/test_tmuxobject.py
@@ -60,7 +60,7 @@ def test_find_where_multiple_infos(server: Server, session: Session) -> None:
         assert session_name is not None
 
         find_where = server.sessions.get(
-            session_id=session_id, session_name=session_name
+            session_id=session_id, session_name=session_name,
         )
 
         assert find_where == session
@@ -74,7 +74,7 @@ def test_find_where_multiple_infos(server: Server, session: Session) -> None:
             assert window_index is not None
 
             find_window_where = session.windows.get(
-                window_id=window_id, window_index=window_index
+                window_id=window_id, window_index=window_index,
             )
 
             assert find_window_where == window
@@ -105,7 +105,7 @@ def test_where(server: Server, session: Session) -> None:
         assert session_name is not None
 
         server_sessions = server.sessions.filter(
-            session_id=session_id, session_name=session_name
+            session_id=session_id, session_name=session_name,
         )
 
         assert len(server_sessions) == 1
@@ -122,7 +122,7 @@ def test_where(server: Server, session: Session) -> None:
             assert window_index is not None
 
             session_windows = session.windows.filter(
-                window_id=window_id, window_index=window_index
+                window_id=window_id, window_index=window_index,
             )
 
             assert len(session_windows) == 1
diff --git a/tests/test_window.py b/tests/test_window.py
index b61653103..2dde78d7a 100644
--- a/tests/test_window.py
+++ b/tests/test_window.py
@@ -175,7 +175,7 @@ def test_split_window_horizontal(session: Session) -> None:
     [("test", "ha ha ha fjewlkjflwef"), ("test", "hello \\ wazzup 0")],
 )
 def test_window_rename(
-    session: Session, window_name_before: str, window_name_after: str
+    session: Session, window_name_before: str, window_name_after: str,
 ) -> None:
     """Test Window.rename_window()."""
     window_name_before = "test"
@@ -320,7 +320,7 @@ def test_select_layout_accepts_no_arg(server: Server, session: Session) -> None:
 
 
 @pytest.mark.skipif(
-    has_lt_version("3.2"), reason="needs filter introduced in tmux >= 3.2"
+    has_lt_version("3.2"), reason="needs filter introduced in tmux >= 3.2",
 )
 def test_empty_window_name(session: Session) -> None:
     """New windows can be created with empty string for window name."""

From 9a138dfe7d2f163b258e01c97a9107a17d44e224 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 07:08:14 -0600
Subject: [PATCH 09/16] ruff format (after adding flake8-commas)

---
 src/libtmux/_internal/query_list.py |  4 +++-
 src/libtmux/_vendor/version.py      | 16 ++++++++++++----
 src/libtmux/common.py               | 10 +++++++---
 src/libtmux/exc.py                  |  5 ++++-
 src/libtmux/neo.py                  |  9 +++++++--
 src/libtmux/pane.py                 |  8 ++++++--
 src/libtmux/pytest_plugin.py        |  4 +++-
 src/libtmux/server.py               |  3 ++-
 src/libtmux/session.py              | 22 ++++++++++++++++------
 src/libtmux/test.py                 | 14 ++++++++++----
 src/libtmux/window.py               |  8 ++++++--
 tests/legacy_api/test_common.py     |  4 +++-
 tests/legacy_api/test_pane.py       |  4 +++-
 tests/legacy_api/test_session.py    |  5 ++++-
 tests/legacy_api/test_window.py     |  7 +++++--
 tests/test_common.py                |  4 +++-
 tests/test_pane.py                  |  4 +++-
 tests/test_session.py               |  5 ++++-
 tests/test_tmuxobject.py            | 12 ++++++++----
 tests/test_window.py                |  7 +++++--
 20 files changed, 114 insertions(+), 41 deletions(-)

diff --git a/src/libtmux/_internal/query_list.py b/src/libtmux/_internal/query_list.py
index 9e0e8600f..0a12875de 100644
--- a/src/libtmux/_internal/query_list.py
+++ b/src/libtmux/_internal/query_list.py
@@ -66,7 +66,9 @@ def keygetter(
 
 
 def parse_lookup(
-    obj: "Mapping[str, t.Any]", path: str, lookup: str,
+    obj: "Mapping[str, t.Any]",
+    path: str,
+    lookup: str,
 ) -> t.Optional[t.Any]:
     """Check if field lookup key, e.g. "my__path__contains" has comparator, return val.
 
diff --git a/src/libtmux/_vendor/version.py b/src/libtmux/_vendor/version.py
index 889c2ac8f..808b317bf 100644
--- a/src/libtmux/_vendor/version.py
+++ b/src/libtmux/_vendor/version.py
@@ -33,12 +33,18 @@
     ],
 ]
 CmpKey = Tuple[
-    int, Tuple[int, ...], PrePostDevType, PrePostDevType, PrePostDevType, LocalType,
+    int,
+    Tuple[int, ...],
+    PrePostDevType,
+    PrePostDevType,
+    PrePostDevType,
+    LocalType,
 ]
 VersionComparisonMethod = Callable[[CmpKey, CmpKey], bool]
 
 _Version = collections.namedtuple(
-    "_Version", ["epoch", "release", "dev", "pre", "post", "local"],
+    "_Version",
+    ["epoch", "release", "dev", "pre", "post", "local"],
 )
 
 
@@ -220,7 +226,8 @@ def __init__(self, version: str) -> None:
             release=tuple(int(i) for i in match.group("release").split(".")),
             pre=_parse_letter_version(match.group("pre_l"), match.group("pre_n")),
             post=_parse_letter_version(
-                match.group("post_l"), match.group("post_n1") or match.group("post_n2"),
+                match.group("post_l"),
+                match.group("post_n1") or match.group("post_n2"),
             ),
             dev=_parse_letter_version(match.group("dev_l"), match.group("dev_n")),
             local=_parse_local_version(match.group("local")),
@@ -468,7 +475,8 @@ def micro(self) -> int:
 
 
 def _parse_letter_version(
-    letter: str, number: Union[str, bytes, SupportsInt],
+    letter: str,
+    number: Union[str, bytes, SupportsInt],
 ) -> Optional[Tuple[str, int]]:
     if letter:
         # We consider there to be an implicit 0 in a pre-release if there is
diff --git a/src/libtmux/common.py b/src/libtmux/common.py
index c17b32ef4..6d722e4c9 100644
--- a/src/libtmux/common.py
+++ b/src/libtmux/common.py
@@ -228,7 +228,9 @@ def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
 
         try:
             self.process = subprocess.Popen(
-                cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                cmd,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
             )
             stdout, stderr = self.process.communicate()
             returncode = self.process.returncode
@@ -255,7 +257,8 @@ def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
 
         logger.debug(
             "self.stdout for {cmd}: {stdout}".format(
-                cmd=" ".join(cmd), stdout=self.stdout,
+                cmd=" ".join(cmd),
+                stdout=self.stdout,
             ),
         )
 
@@ -409,7 +412,8 @@ def has_minimum_version(raises: bool = True) -> bool:
             raise exc.VersionTooLow(
                 "libtmux only supports tmux {} and greater. This system"
                 " has {} installed. Upgrade your tmux to use libtmux.".format(
-                    TMUX_MIN_VERSION, get_version(),
+                    TMUX_MIN_VERSION,
+                    get_version(),
                 ),
             )
         else:
diff --git a/src/libtmux/exc.py b/src/libtmux/exc.py
index 2b9e53e7c..c77604599 100644
--- a/src/libtmux/exc.py
+++ b/src/libtmux/exc.py
@@ -51,7 +51,10 @@ class BadSessionName(LibTmuxException):
     """Disallowed session name for tmux (empty, contains periods or colons)."""
 
     def __init__(
-        self, reason: str, session_name: t.Optional[str] = None, *args: object,
+        self,
+        reason: str,
+        session_name: t.Optional[str] = None,
+        *args: object,
     ):
         msg = f"Bad session name: {reason}"
         if session_name is not None:
diff --git a/src/libtmux/neo.py b/src/libtmux/neo.py
index 1f290783e..926da8254 100644
--- a/src/libtmux/neo.py
+++ b/src/libtmux/neo.py
@@ -170,7 +170,10 @@ def _refresh(
     ) -> None:
         assert isinstance(obj_id, str)
         obj = fetch_obj(
-            obj_key=obj_key, obj_id=obj_id, list_cmd=list_cmd, server=self.server,
+            obj_key=obj_key,
+            obj_id=obj_id,
+            list_cmd=list_cmd,
+            server=self.server,
         )
         assert obj is not None
         if obj is not None:
@@ -233,7 +236,9 @@ def fetch_obj(
 ) -> OutputRaw:
     """Fetch raw data from tmux command."""
     obj_formatters_filtered = fetch_objs(
-        server=server, list_cmd=list_cmd, list_extra_args=list_extra_args,
+        server=server,
+        list_cmd=list_cmd,
+        list_extra_args=list_extra_args,
     )
 
     obj = None
diff --git a/src/libtmux/pane.py b/src/libtmux/pane.py
index bec282ecf..907b23205 100644
--- a/src/libtmux/pane.py
+++ b/src/libtmux/pane.py
@@ -245,7 +245,9 @@ def send_keys(
 
     @overload
     def display_message(
-        self, cmd: str, get_text: "t.Literal[True]",
+        self,
+        cmd: str,
+        get_text: "t.Literal[True]",
     ) -> t.Union[str, t.List[str]]:
         ...
 
@@ -254,7 +256,9 @@ def display_message(self, cmd: str, get_text: "t.Literal[False]") -> None:
         ...
 
     def display_message(
-        self, cmd: str, get_text: bool = False,
+        self,
+        cmd: str,
+        get_text: bool = False,
     ) -> t.Optional[t.Union[str, t.List[str]]]:
         """Display message to pane.
 
diff --git a/src/libtmux/pytest_plugin.py b/src/libtmux/pytest_plugin.py
index 6c8d9b78c..7cd44c91c 100644
--- a/src/libtmux/pytest_plugin.py
+++ b/src/libtmux/pytest_plugin.py
@@ -185,7 +185,9 @@ def session_params() -> t.Dict[str, t.Any]:
 
 @pytest.fixture(scope="function")
 def session(
-    request: pytest.FixtureRequest, session_params: t.Dict[str, t.Any], server: Server,
+    request: pytest.FixtureRequest,
+    session_params: t.Dict[str, t.Any],
+    server: Server,
 ) -> "Session":
     """Return new, temporary :class:`libtmux.Session`.
 
diff --git a/src/libtmux/server.py b/src/libtmux/server.py
index 6d676dff5..2148fe604 100644
--- a/src/libtmux/server.py
+++ b/src/libtmux/server.py
@@ -483,7 +483,8 @@ def new_session(
         )
 
         return Session.from_session_id(
-            server=self, session_id=session_formatters["session_id"],
+            server=self,
+            session_id=session_formatters["session_id"],
         )
 
     #
diff --git a/src/libtmux/session.py b/src/libtmux/session.py
index 674094d1b..02291a87e 100644
--- a/src/libtmux/session.py
+++ b/src/libtmux/session.py
@@ -77,7 +77,9 @@ def refresh(self) -> None:
         """Refresh session attributes from tmux."""
         assert isinstance(self.session_id, str)
         return super()._refresh(
-            obj_key="session_id", obj_id=self.session_id, list_cmd="list-sessions",
+            obj_key="session_id",
+            obj_id=self.session_id,
+            list_cmd="list-sessions",
         )
 
     @classmethod
@@ -169,7 +171,10 @@ def cmd(self, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
     """
 
     def set_option(
-        self, option: str, value: t.Union[str, int], _global: bool = False,
+        self,
+        option: str,
+        value: t.Union[str, int],
+        _global: bool = False,
     ) -> "Session":
         """Set option ``$ tmux set-option <option> <value>``.
 
@@ -220,7 +225,8 @@ def set_option(
         return self
 
     def show_options(
-        self, _global: t.Optional[bool] = False,
+        self,
+        _global: t.Optional[bool] = False,
     ) -> t.Dict[str, t.Union[str, int]]:
         """Return dict of options for the session.
 
@@ -258,7 +264,9 @@ def show_options(
         return session_options
 
     def show_option(
-        self, option: str, _global: bool = False,
+        self,
+        option: str,
+        _global: bool = False,
     ) -> t.Optional[t.Union[str, int, bool]]:
         """Return option value for the target session.
 
@@ -506,7 +514,8 @@ def new_window(
         )
 
         return Window.from_window_id(
-            server=self.server, window_id=window_formatters["window_id"],
+            server=self.server,
+            window_id=window_formatters["window_id"],
         )
 
     def kill_window(self, target_window: t.Optional[str] = None) -> None:
@@ -604,7 +613,8 @@ def __getitem__(self, key: str) -> t.Any:
 
         """
         warnings.warn(
-            f"Item lookups, e.g. session['{key}'] is deprecated", stacklevel=2,
+            f"Item lookups, e.g. session['{key}'] is deprecated",
+            stacklevel=2,
         )
         return getattr(self, key)
 
diff --git a/src/libtmux/test.py b/src/libtmux/test.py
index 74bf17a37..c298af300 100644
--- a/src/libtmux/test.py
+++ b/src/libtmux/test.py
@@ -28,7 +28,8 @@ class RandomStrSequence:
     """Factory to generate random string."""
 
     def __init__(
-        self, characters: str = "abcdefghijklmnopqrstuvwxyz0123456789_",
+        self,
+        characters: str = "abcdefghijklmnopqrstuvwxyz0123456789_",
     ) -> None:
         """Create a random letter / number generator. 8 chars in length.
 
@@ -141,7 +142,8 @@ def get_test_session_name(server: "Server", prefix: str = TEST_SESSION_PREFIX) -
 
 
 def get_test_window_name(
-    session: "Session", prefix: t.Optional[str] = TEST_SESSION_PREFIX,
+    session: "Session",
+    prefix: t.Optional[str] = TEST_SESSION_PREFIX,
 ) -> str:
     """
     Faker to create a window name that doesn't exist.
@@ -180,7 +182,9 @@ def get_test_window_name(
 
 @contextlib.contextmanager
 def temp_session(
-    server: Server, *args: t.Any, **kwargs: t.Any,
+    server: Server,
+    *args: t.Any,
+    **kwargs: t.Any,
 ) -> t.Generator["Session", t.Any, t.Any]:
     """
     Return a context manager with a temporary session.
@@ -230,7 +234,9 @@ def temp_session(
 
 @contextlib.contextmanager
 def temp_window(
-    session: "Session", *args: t.Any, **kwargs: t.Any,
+    session: "Session",
+    *args: t.Any,
+    **kwargs: t.Any,
 ) -> t.Generator["Window", t.Any, t.Any]:
     """
     Return a context manager with a temporary window.
diff --git a/src/libtmux/window.py b/src/libtmux/window.py
index 8ea4a7e57..87e4d560c 100644
--- a/src/libtmux/window.py
+++ b/src/libtmux/window.py
@@ -399,7 +399,9 @@ def show_window_options(self, g: t.Optional[bool] = False) -> "WindowOptionDict"
         return window_options
 
     def show_window_option(
-        self, option: str, g: bool = False,
+        self,
+        option: str,
+        g: bool = False,
     ) -> t.Optional[t.Union[str, int]]:
         """Return option value for the target window.
 
@@ -486,7 +488,9 @@ def kill_window(self) -> None:
             raise exc.LibTmuxException(proc.stderr)
 
     def move_window(
-        self, destination: str = "", session: t.Optional[str] = None,
+        self,
+        destination: str = "",
+        session: t.Optional[str] = None,
     ) -> "Window":
         """Move current :class:`Window` object ``$ tmux move-window``.
 
diff --git a/tests/legacy_api/test_common.py b/tests/legacy_api/test_common.py
index e5c8897a5..b237cde4d 100644
--- a/tests/legacy_api/test_common.py
+++ b/tests/legacy_api/test_common.py
@@ -215,7 +215,9 @@ class SessionCheckName(t.NamedTuple):
     ],
 )
 def test_session_check_name(
-    session_name: t.Optional[str], raises: bool, exc_msg_regex: t.Optional[str],
+    session_name: t.Optional[str],
+    raises: bool,
+    exc_msg_regex: t.Optional[str],
 ) -> None:
     """Verify session_check_name()."""
     if raises:
diff --git a/tests/legacy_api/test_pane.py b/tests/legacy_api/test_pane.py
index 03dc167dd..4c5b0dbb2 100644
--- a/tests/legacy_api/test_pane.py
+++ b/tests/legacy_api/test_pane.py
@@ -83,7 +83,9 @@ def test_capture_pane(session: Session) -> None:
     pane_contents = "\n".join(pane.capture_pane())
     assert pane_contents == "$"
     pane.send_keys(
-        r'printf "\n%s\n" "Hello World !"', literal=True, suppress_history=False,
+        r'printf "\n%s\n" "Hello World !"',
+        literal=True,
+        suppress_history=False,
     )
     pane_contents = "\n".join(pane.capture_pane())
     assert pane_contents == r'$ printf "\n%s\n" "Hello World !"{}'.format(
diff --git a/tests/legacy_api/test_session.py b/tests/legacy_api/test_session.py
index 061287548..93626a38e 100644
--- a/tests/legacy_api/test_session.py
+++ b/tests/legacy_api/test_session.py
@@ -220,7 +220,10 @@ def test_unset_environment(session: Session) -> None:
     [("hey.period", True), ("hey:its a colon", True), ("hey moo", False)],
 )
 def test_periods_raise_badsessionname(
-    server: Server, session: Session, session_name: str, raises: bool,
+    server: Server,
+    session: Session,
+    session_name: str,
+    raises: bool,
 ) -> None:
     """Verify session names with periods raise BadSessionName."""
     new_name = session_name + "moo"  # used for rename / switch
diff --git a/tests/legacy_api/test_window.py b/tests/legacy_api/test_window.py
index f3f968757..924049d0f 100644
--- a/tests/legacy_api/test_window.py
+++ b/tests/legacy_api/test_window.py
@@ -162,7 +162,9 @@ def test_split_window_horizontal(session: Session) -> None:
     [("test", "ha ha ha fjewlkjflwef"), ("test", "hello \\ wazzup 0")],
 )
 def test_window_rename(
-    session: Session, window_name_before: str, window_name_after: str,
+    session: Session,
+    window_name_before: str,
+    window_name_after: str,
 ) -> None:
     """Test Window.rename_window()."""
     window_name_before = "test"
@@ -308,7 +310,8 @@ def test_select_layout_accepts_no_arg(server: Server, session: Session) -> None:
 
 
 @pytest.mark.skipif(
-    has_lt_version("3.2"), reason="needs filter introduced in tmux >= 3.2",
+    has_lt_version("3.2"),
+    reason="needs filter introduced in tmux >= 3.2",
 )
 def test_empty_window_name(session: Session) -> None:
     """New windows can be created with empty string for window name."""
diff --git a/tests/test_common.py b/tests/test_common.py
index e5c8897a5..b237cde4d 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -215,7 +215,9 @@ class SessionCheckName(t.NamedTuple):
     ],
 )
 def test_session_check_name(
-    session_name: t.Optional[str], raises: bool, exc_msg_regex: t.Optional[str],
+    session_name: t.Optional[str],
+    raises: bool,
+    exc_msg_regex: t.Optional[str],
 ) -> None:
     """Verify session_check_name()."""
     if raises:
diff --git a/tests/test_pane.py b/tests/test_pane.py
index a2953687c..3ca421c69 100644
--- a/tests/test_pane.py
+++ b/tests/test_pane.py
@@ -87,7 +87,9 @@ def test_capture_pane(session: Session) -> None:
     pane_contents = "\n".join(pane.capture_pane())
     assert pane_contents == "$"
     pane.send_keys(
-        r'printf "\n%s\n" "Hello World !"', literal=True, suppress_history=False,
+        r'printf "\n%s\n" "Hello World !"',
+        literal=True,
+        suppress_history=False,
     )
     pane_contents = "\n".join(pane.capture_pane())
     assert pane_contents == r'$ printf "\n%s\n" "Hello World !"{}'.format(
diff --git a/tests/test_session.py b/tests/test_session.py
index 5d515eabf..b091a5f5f 100644
--- a/tests/test_session.py
+++ b/tests/test_session.py
@@ -231,7 +231,10 @@ class PeriodRaisesBadSessionName(t.NamedTuple):
     ],
 )
 def test_periods_raise_bad_session_name(
-    server: Server, session: Session, session_name: str, raises: bool,
+    server: Server,
+    session: Session,
+    session_name: str,
+    raises: bool,
 ) -> None:
     """Verify session names with periods raise BadSessionName."""
     new_name = session_name + "moo"  # used for rename / switch
diff --git a/tests/test_tmuxobject.py b/tests/test_tmuxobject.py
index 08fe09aa7..8042aacb8 100644
--- a/tests/test_tmuxobject.py
+++ b/tests/test_tmuxobject.py
@@ -60,7 +60,8 @@ def test_find_where_multiple_infos(server: Server, session: Session) -> None:
         assert session_name is not None
 
         find_where = server.sessions.get(
-            session_id=session_id, session_name=session_name,
+            session_id=session_id,
+            session_name=session_name,
         )
 
         assert find_where == session
@@ -74,7 +75,8 @@ def test_find_where_multiple_infos(server: Server, session: Session) -> None:
             assert window_index is not None
 
             find_window_where = session.windows.get(
-                window_id=window_id, window_index=window_index,
+                window_id=window_id,
+                window_index=window_index,
             )
 
             assert find_window_where == window
@@ -105,7 +107,8 @@ def test_where(server: Server, session: Session) -> None:
         assert session_name is not None
 
         server_sessions = server.sessions.filter(
-            session_id=session_id, session_name=session_name,
+            session_id=session_id,
+            session_name=session_name,
         )
 
         assert len(server_sessions) == 1
@@ -122,7 +125,8 @@ def test_where(server: Server, session: Session) -> None:
             assert window_index is not None
 
             session_windows = session.windows.filter(
-                window_id=window_id, window_index=window_index,
+                window_id=window_id,
+                window_index=window_index,
             )
 
             assert len(session_windows) == 1
diff --git a/tests/test_window.py b/tests/test_window.py
index 2dde78d7a..47ec07205 100644
--- a/tests/test_window.py
+++ b/tests/test_window.py
@@ -175,7 +175,9 @@ def test_split_window_horizontal(session: Session) -> None:
     [("test", "ha ha ha fjewlkjflwef"), ("test", "hello \\ wazzup 0")],
 )
 def test_window_rename(
-    session: Session, window_name_before: str, window_name_after: str,
+    session: Session,
+    window_name_before: str,
+    window_name_after: str,
 ) -> None:
     """Test Window.rename_window()."""
     window_name_before = "test"
@@ -320,7 +322,8 @@ def test_select_layout_accepts_no_arg(server: Server, session: Session) -> None:
 
 
 @pytest.mark.skipif(
-    has_lt_version("3.2"), reason="needs filter introduced in tmux >= 3.2",
+    has_lt_version("3.2"),
+    reason="needs filter introduced in tmux >= 3.2",
 )
 def test_empty_window_name(session: Session) -> None:
     """New windows can be created with empty string for window name."""

From 8cf70a4c059105eade8ac8518abd50c1f94cdb16 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 07:08:48 -0600
Subject: [PATCH 10/16] pyproject(ruff): flake8-commas

---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index f98dcd11d..9a208c2b5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -124,6 +124,7 @@ select = [
   "UP", # pyupgrade
   "B", # flake8-bugbear
   "C4", # flake8-comprehensions
+  "COM", # flake8-commas
   "Q", # flake8-quotes
   "PTH", # flake8-use-pathlib
   "SIM", # flake8-simplify

From 66e26508aef74929c42f0c8920d83ff27e1aef20 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 07:22:16 -0600
Subject: [PATCH 11/16] pyproject(ruff): Ignore COM812 for `ruff format`

See also:
- https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
- https://docs.astral.sh/ruff/rules/missing-trailing-comma/
---
 pyproject.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 9a208c2b5..ba4ef3edb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -133,6 +133,9 @@ select = [
   "RUF", # Ruff-specific rules
   "D", # pydocstyle
 ]
+ignore = [
+  "COM812", # missing trailing comma, ruff format conflict
+]
 
 [tool.ruff.lint.isort]
 known-first-party = [

From cea1967aecc54b7bb45282596afd199500d349d9 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 07:10:56 -0600
Subject: [PATCH 12/16] pyproject(ruff): flake8-builtins

See also:
- https://docs.astral.sh/ruff/rules/#flake8-builtins-a
- https://pypi.org/project/flake8-builtins/
---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index ba4ef3edb..74e1ea525 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -122,6 +122,7 @@ select = [
   "F", # pyflakes
   "I", # isort
   "UP", # pyupgrade
+  "A", # flake8-builtins
   "B", # flake8-bugbear
   "C4", # flake8-comprehensions
   "COM", # flake8-commas

From 00a5863f1dfe43f78a84a6794911e3638bb0337f Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 07:15:47 -0600
Subject: [PATCH 13/16] fix!: Fix shadowing of python builtins

docs/conf.py:57:1: A001 Variable `copyright` is shadowing a Python builtin
src/libtmux/common.py:142:9: A001 Variable `vars` is shadowing a Python builtin
src/libtmux/common.py:179:9: A001 Variable `vars` is shadowing a Python builtin
src/libtmux/server.py:618:25: A002 Argument `id` is shadowing a Python builtin
src/libtmux/session.py:621:25: A002 Argument `id` is shadowing a Python builtin
src/libtmux/window.py:656:25: A002 Argument `id` is shadowing a Python builtin
---
 docs/conf.py           |  2 +-
 src/libtmux/common.py  | 24 ++++++++++++------------
 src/libtmux/server.py  |  4 ++--
 src/libtmux/session.py |  4 ++--
 src/libtmux/window.py  |  4 ++--
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 65adbd87c..1b804d5c2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -54,7 +54,7 @@
 master_doc = "index"
 
 project = about["__title__"]
-copyright = about["__copyright__"]
+project_copyright = about["__copyright__"]
 
 version = "%s" % (".".join(about["__version__"].split("."))[:2])
 release = "%s" % (about["__version__"])
diff --git a/src/libtmux/common.py b/src/libtmux/common.py
index 6d722e4c9..7d39a4f72 100644
--- a/src/libtmux/common.py
+++ b/src/libtmux/common.py
@@ -137,17 +137,17 @@ def show_environment(self) -> Dict[str, Union[bool, str]]:
             tmux_args += [self._add_option]
         cmd = self.cmd(*tmux_args)
         output = cmd.stdout
-        vars = [tuple(item.split("=", 1)) for item in output]
-        vars_dict: t.Dict[str, t.Union[str, bool]] = {}
-        for _t in vars:
+        opts = [tuple(item.split("=", 1)) for item in output]
+        opts_dict: t.Dict[str, t.Union[str, bool]] = {}
+        for _t in opts:
             if len(_t) == 2:
-                vars_dict[_t[0]] = _t[1]
+                opts_dict[_t[0]] = _t[1]
             elif len(_t) == 1:
-                vars_dict[_t[0]] = True
+                opts_dict[_t[0]] = True
             else:
                 raise exc.VariableUnpackingError(variable=_t)
 
-        return vars_dict
+        return opts_dict
 
     def getenv(self, name: str) -> Optional[t.Union[str, bool]]:
         """Show environment variable ``$ tmux show-environment -t [session] <name>``.
@@ -174,17 +174,17 @@ def getenv(self, name: str) -> Optional[t.Union[str, bool]]:
         tmux_args += (name,)
         cmd = self.cmd(*tmux_args)
         output = cmd.stdout
-        vars = [tuple(item.split("=", 1)) for item in output]
-        vars_dict: t.Dict[str, t.Union[str, bool]] = {}
-        for _t in vars:
+        opts = [tuple(item.split("=", 1)) for item in output]
+        opts_dict: t.Dict[str, t.Union[str, bool]] = {}
+        for _t in opts:
             if len(_t) == 2:
-                vars_dict[_t[0]] = _t[1]
+                opts_dict[_t[0]] = _t[1]
             elif len(_t) == 1:
-                vars_dict[_t[0]] = True
+                opts_dict[_t[0]] = True
             else:
                 raise exc.VariableUnpackingError(variable=_t)
 
-        return vars_dict.get(name)
+        return opts_dict.get(name)
 
 
 class tmux_cmd:
diff --git a/src/libtmux/server.py b/src/libtmux/server.py
index 2148fe604..06ea1fc28 100644
--- a/src/libtmux/server.py
+++ b/src/libtmux/server.py
@@ -606,7 +606,7 @@ def _update_panes(self) -> "Server":
         self._list_panes()
         return self
 
-    def get_by_id(self, id: str) -> t.Optional[Session]:
+    def get_by_id(self, session_id: str) -> t.Optional[Session]:
         """Return session by id. Deprecated in favor of :meth:`.sessions.get()`.
 
         .. deprecated:: 0.16
@@ -615,7 +615,7 @@ def get_by_id(self, id: str) -> t.Optional[Session]:
 
         """
         warnings.warn("Server.get_by_id() is deprecated", stacklevel=2)
-        return self.sessions.get(session_id=id, default=None)
+        return self.sessions.get(session_id=session_id, default=None)
 
     def where(self, kwargs: t.Dict[str, t.Any]) -> t.List[Session]:
         """Filter through sessions, return list of :class:`Session`.
diff --git a/src/libtmux/session.py b/src/libtmux/session.py
index 02291a87e..33e04ad5a 100644
--- a/src/libtmux/session.py
+++ b/src/libtmux/session.py
@@ -618,7 +618,7 @@ def __getitem__(self, key: str) -> t.Any:
         )
         return getattr(self, key)
 
-    def get_by_id(self, id: str) -> t.Optional[Window]:
+    def get_by_id(self, session_id: str) -> t.Optional[Window]:
         """Return window by id. Deprecated in favor of :meth:`.windows.get()`.
 
         .. deprecated:: 0.16
@@ -627,7 +627,7 @@ def get_by_id(self, id: str) -> t.Optional[Window]:
 
         """
         warnings.warn("Session.get_by_id() is deprecated", stacklevel=2)
-        return self.windows.get(window_id=id, default=None)
+        return self.windows.get(window_id=session_id, default=None)
 
     def where(self, kwargs: t.Dict[str, t.Any]) -> t.List[Window]:
         """Filter through windows, return list of :class:`Window`.
diff --git a/src/libtmux/window.py b/src/libtmux/window.py
index 87e4d560c..23c82f7a8 100644
--- a/src/libtmux/window.py
+++ b/src/libtmux/window.py
@@ -653,7 +653,7 @@ def __getitem__(self, key: str) -> t.Any:
         warnings.warn(f"Item lookups, e.g. window['{key}'] is deprecated", stacklevel=2)
         return getattr(self, key)
 
-    def get_by_id(self, id: str) -> t.Optional[Pane]:
+    def get_by_id(self, pane_id: str) -> t.Optional[Pane]:
         """Return pane by id. Deprecated in favor of :meth:`.panes.get()`.
 
         .. deprecated:: 0.16
@@ -662,7 +662,7 @@ def get_by_id(self, id: str) -> t.Optional[Pane]:
 
         """
         warnings.warn("Window.get_by_id() is deprecated", stacklevel=2)
-        return self.panes.get(pane_id=id, default=None)
+        return self.panes.get(pane_id=pane_id, default=None)
 
     def where(self, kwargs: t.Dict[str, t.Any]) -> t.List[Pane]:
         """Filter through panes, return list of :class:`Pane`.

From b1c3ade684123e7d6a646c5ee5f5150824f3dfbb Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 07:18:31 -0600
Subject: [PATCH 14/16] pyproject(ruff): Add flake8-errmsg

See also:
- https://docs.astral.sh/ruff/rules/#flake8-errmsg-em
- https://pypi.org/project/flake8-errmsg/
---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index 74e1ea525..d283090da 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -126,6 +126,7 @@ select = [
   "B", # flake8-bugbear
   "C4", # flake8-comprehensions
   "COM", # flake8-commas
+  "EM", # flake8-errmsg
   "Q", # flake8-quotes
   "PTH", # flake8-use-pathlib
   "SIM", # flake8-simplify

From 1d46d79cb47a68e172922f031be4bceaa3ea59e5 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 07:19:45 -0600
Subject: [PATCH 15/16] fix: direct `.format()` usage in exception message

src/libtmux/common.py:423:17: EM103 Exception must not use a `.format()` string directly, assign to variable first
---
 src/libtmux/common.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libtmux/common.py b/src/libtmux/common.py
index 7d39a4f72..c8bb6ccc4 100644
--- a/src/libtmux/common.py
+++ b/src/libtmux/common.py
@@ -409,13 +409,14 @@ def has_minimum_version(raises: bool = True) -> bool:
     """
     if get_version() < LooseVersion(TMUX_MIN_VERSION):
         if raises:
-            raise exc.VersionTooLow(
+            msg = (
                 "libtmux only supports tmux {} and greater. This system"
                 " has {} installed. Upgrade your tmux to use libtmux.".format(
                     TMUX_MIN_VERSION,
                     get_version(),
-                ),
+                )
             )
+            raise exc.VersionTooLow(msg)
         else:
             return False
     return True

From 0c7db83d0ea701d5ed0afd3c4347dd519284255e Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Tue, 6 Feb 2024 08:25:46 -0600
Subject: [PATCH 16/16] docs(CHANGES): Note docstring fixes, improved linting

---
 CHANGES | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/CHANGES b/CHANGES
index 5eaaab24b..06a6b895b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,29 @@ $ pip install --user --upgrade --pre libtmux
 
 <!-- Maintainers and contributors: Insert change notes for the next release above -->
 
+### Documentation
+
+- Various docstring fixes and tweaks (#514)
+
+### Development
+
+- Strengthen linting (#514)
+
+  - Add flake8-commas (COM)
+
+	- https://docs.astral.sh/ruff/rules/#flake8-commas-com
+	- https://pypi.org/project/flake8-commas/
+
+  - Add flake8-builtins (A)
+
+	- https://docs.astral.sh/ruff/rules/#flake8-builtins-a
+	- https://pypi.org/project/flake8-builtins/
+
+  - Add flake8-errmsg (EM)
+
+	- https://docs.astral.sh/ruff/rules/#flake8-errmsg-em
+	- https://pypi.org/project/flake8-errmsg/
+
 ### CI
 
 - Move CodeQL from advanced configuration file to GitHub's default