chore(ruff) ruff v0.12 aggressive fixes

uv run ruff check --select ALL . --fix --unsafe-fixes --preview --show-fixes; uv run ruff format .

Fixed 28 errors:
- src/libtmux/common.py:
    2 × ISC003 (explicit-string-concatenation)
- src/libtmux/pane.py:
    1 × TC001 (typing-only-first-party-import)
    1 × I001 (unsorted-imports)
- src/libtmux/server.py:
    1 × TC001 (typing-only-first-party-import)
    1 × I001 (unsorted-imports)
- src/libtmux/session.py:
    1 × ISC003 (explicit-string-concatenation)
- src/libtmux/window.py:
    2 × ISC003 (explicit-string-concatenation)
    1 × I001 (unsorted-imports)
    1 × TC001 (typing-only-first-party-import)
- tests/legacy_api/test_window.py:
    1 × ISC003 (explicit-string-concatenation)
- tests/test_pane.py:
    1 × PLR6201 (literal-membership)
    1 × TC001 (typing-only-first-party-import)
    1 × COM812 (missing-trailing-comma)
    1 × RUF027 (missing-f-string-syntax)
- tests/test_server.py:
    1 × PLR6201 (literal-membership)
    1 × TC001 (typing-only-first-party-import)
    1 × COM812 (missing-trailing-comma)
    1 × RUF027 (missing-f-string-syntax)
- tests/test_session.py:
    1 × PLR6201 (literal-membership)
    1 × TC001 (typing-only-first-party-import)
    1 × COM812 (missing-trailing-comma)
    1 × RUF027 (missing-f-string-syntax)
- tests/test_window.py:
    1 × PLR6201 (literal-membership)
    1 × TC001 (typing-only-first-party-import)
    1 × COM812 (missing-trailing-comma)
    1 × RUF027 (missing-f-string-syntax)

Found 1699 errors (28 fixed, 1671 remaining).

Author: tony

src/libtmux/common.py

@@ -418,8 +418,8 @@ def has_minimum_version(raises: bool = True) -> bool:
         if raises:
             msg = (
                 f"libtmux only supports tmux {TMUX_MIN_VERSION} and greater. This "
-                + f"system has {get_version()} installed. Upgrade your tmux to use "
-                + "libtmux."
+                f"system has {get_version()} installed. Upgrade your tmux to use "
+                "libtmux."
             )
             raise exc.VersionTooLow(msg)
         return False

src/libtmux/pane.py

@@ -14,7 +14,6 @@
 import warnings
 
 from libtmux import exc
-from libtmux._internal.types import StrPath
 from libtmux.common import has_gte_version, has_lt_version, tmux_cmd
 from libtmux.constants import (
     PANE_DIRECTION_FLAG_MAP,
@@ -29,6 +28,8 @@
     import sys
     import types
 
+    from libtmux._internal.types import StrPath
+
     from .server import Server
     from .session import Session
     from .window import Window

src/libtmux/server.py

@@ -17,7 +17,6 @@
 
 from libtmux import exc, formats
 from libtmux._internal.query_list import QueryList
-from libtmux._internal.types import StrPath
 from libtmux.common import tmux_cmd
 from libtmux.neo import fetch_objs
 from libtmux.pane import Pane
@@ -37,6 +36,8 @@
     import sys
     import types
 
+    from libtmux._internal.types import StrPath
+
     if sys.version_info >= (3, 10):
         from typing import Self, TypeAlias
     else:

src/libtmux/session.py

@@ -833,7 +833,7 @@ def attached_window(self) -> Window:
         """
         warnings.warn(
             "Session.attached_window() is deprecated in favor of "
-            + "Session.active_window()",
+            "Session.active_window()",
             category=DeprecationWarning,
             stacklevel=2,
         )

src/libtmux/window.py

@@ -14,7 +14,6 @@
 import warnings
 
 from libtmux._internal.query_list import QueryList
-from libtmux._internal.types import StrPath
 from libtmux.common import has_gte_version, tmux_cmd
 from libtmux.constants import (
     RESIZE_ADJUSTMENT_DIRECTION_FLAG_MAP,
@@ -32,6 +31,8 @@
     import sys
     import types
 
+    from libtmux._internal.types import StrPath
+
     from .server import Server
     from .session import Session
 
@@ -793,7 +794,7 @@ def __repr__(self) -> str:
         """Representation of :class:`Window` object."""
         return (
             f"{self.__class__.__name__}({self.window_id} "
-            + f"{self.window_index}:{self.window_name}, {self.session})"
+            f"{self.window_index}:{self.window_name}, {self.session})"
         )
 
     #
@@ -899,7 +900,7 @@ def split_window(
             # Deprecated in 3.1 in favor of -l
             warnings.warn(
                 f'Deprecated in favor of size="{str(percent).rstrip("%")}%" '
-                + ' ("-l" flag) in tmux 3.1+.',
+                ' ("-l" flag) in tmux 3.1+.',
                 category=DeprecationWarning,
                 stacklevel=2,
             )

tests/legacy_api/test_window.py

@@ -176,7 +176,7 @@ def test_split_percentage(
     if has_version("3.4"):
         pytest.skip(
             "tmux 3.4 has a split-window bug."
-            + " See https://github.com/tmux/tmux/pull/3840.",
+            " See https://github.com/tmux/tmux/pull/3840.",
         )
     with pytest.warns(match="Deprecated in favor of size.*"):
         pane = window.split_window(percent=10)

tests/test_pane.py

@@ -9,12 +9,12 @@
 
 import pytest
 
-from libtmux._internal.types import StrPath
 from libtmux.common import has_gte_version, has_lt_version, has_lte_version
 from libtmux.constants import PaneDirection, ResizeAdjustmentDirection
 from libtmux.test.retry import retry_until
 
 if t.TYPE_CHECKING:
+    from libtmux._internal.types import StrPath
     from libtmux.session import Session
 
 logger = logging.getLogger(__name__)
@@ -397,8 +397,8 @@ def test_split_start_directory(
     actual_start_directory = start_directory
     expected_path = None
 
-    if start_directory and str(start_directory) not in ["", "None"]:
-        if "{user_path}" in str(start_directory):
+    if start_directory and str(start_directory) not in {"", "None"}:
+        if f"{user_path}" in str(start_directory):
             # Replace placeholder with actual user_path
             actual_start_directory = str(start_directory).format(user_path=user_path)
             expected_path = str(user_path)
@@ -424,7 +424,8 @@ def test_split_start_directory(
 
 
 def test_split_start_directory_pathlib(
-    session: Session, user_path: pathlib.Path
+    session: Session,
+    user_path: pathlib.Path,
 ) -> None:
     """Test Pane.split accepts pathlib.Path for start_directory."""
     window = session.new_window(window_name="test_split_pathlib")

tests/test_server.py

@@ -11,11 +11,11 @@
 
 import pytest
 
-from libtmux._internal.types import StrPath
 from libtmux.common import has_gte_version, has_version
 from libtmux.server import Server
 
 if t.TYPE_CHECKING:
+    from libtmux._internal.types import StrPath
     from libtmux.session import Session
 
 logger = logging.getLogger(__name__)
@@ -365,8 +365,8 @@ def test_new_session_start_directory(
     actual_start_directory = start_directory
     expected_path = None
 
-    if start_directory and str(start_directory) not in ["", "None"]:
-        if "{user_path}" in str(start_directory):
+    if start_directory and str(start_directory) not in {"", "None"}:
+        if f"{user_path}" in str(start_directory):
             # Replace placeholder with actual user_path
             actual_start_directory = str(start_directory).format(user_path=user_path)
             expected_path = str(user_path)
@@ -397,7 +397,8 @@ def test_new_session_start_directory(
 
 
 def test_new_session_start_directory_pathlib(
-    server: Server, user_path: pathlib.Path
+    server: Server,
+    user_path: pathlib.Path,
 ) -> None:
     """Test Server.new_session accepts pathlib.Path for start_directory."""
     # Pass pathlib.Path directly to test pathlib.Path acceptance

tests/test_session.py

@@ -10,7 +10,6 @@
 import pytest
 
 from libtmux import exc
-from libtmux._internal.types import StrPath
 from libtmux.common import has_gte_version, has_lt_version
 from libtmux.constants import WindowDirection
 from libtmux.pane import Pane
@@ -20,6 +19,7 @@
 from libtmux.window import Window
 
 if t.TYPE_CHECKING:
+    from libtmux._internal.types import StrPath
     from libtmux.server import Server
 
 logger = logging.getLogger(__name__)
@@ -488,8 +488,8 @@ def test_new_window_start_directory(
     actual_start_directory = start_directory
     expected_path = None
 
-    if start_directory and str(start_directory) not in ["", "None"]:
-        if "{user_path}" in str(start_directory):
+    if start_directory and str(start_directory) not in {"", "None"}:
+        if f"{user_path}" in str(start_directory):
             # Replace placeholder with actual user_path
             actual_start_directory = str(start_directory).format(user_path=user_path)
             expected_path = str(user_path)
@@ -520,7 +520,8 @@ def test_new_window_start_directory(
 
 
 def test_new_window_start_directory_pathlib(
-    session: Session, user_path: pathlib.Path
+    session: Session,
+    user_path: pathlib.Path,
 ) -> None:
     """Test Session.new_window accepts pathlib.Path for start_directory."""
     # Pass pathlib.Path directly to test pathlib.Path acceptance

tests/test_window.py

@@ -12,7 +12,6 @@
 
 from libtmux import exc
 from libtmux._internal.query_list import ObjectDoesNotExist
-from libtmux._internal.types import StrPath
 from libtmux.common import has_gte_version, has_lt_version, has_lte_version
 from libtmux.constants import (
     PaneDirection,
@@ -24,6 +23,7 @@
 from libtmux.window import Window
 
 if t.TYPE_CHECKING:
+    from libtmux._internal.types import StrPath
     from libtmux.session import Session
 
 logger = logging.getLogger(__name__)
@@ -712,8 +712,8 @@ def test_split_start_directory(
     actual_start_directory = start_directory
     expected_path = None
 
-    if start_directory and str(start_directory) not in ["", "None"]:
-        if "{user_path}" in str(start_directory):
+    if start_directory and str(start_directory) not in {"", "None"}:
+        if f"{user_path}" in str(start_directory):
             # Replace placeholder with actual user_path
             actual_start_directory = str(start_directory).format(user_path=user_path)
             expected_path = str(user_path)
@@ -739,7 +739,8 @@ def test_split_start_directory(
 
 
 def test_split_start_directory_pathlib(
-    session: Session, user_path: pathlib.Path
+    session: Session,
+    user_path: pathlib.Path,
 ) -> None:
     """Test Window.split accepts pathlib.Path for start_directory."""
     window = session.new_window(window_name="test_window_split_pathlib")