chore(ruff) Autofixes for ruff with python 3.10 +

tony · tony · commit e1ec758fc6ab · 2025-11-01T10:28:52.000-05:00
uv run ruff check . --fix --show-fixes
   Building libtmux @ file:///home/d/work/python/libtmux
      Built libtmux @ file:///home/d/work/python/libtmux
Uninstalled 1 package in 0.43ms
Installed 1 package in 0.65ms
B905 `zip()` without an explicit `strict=` parameter
   --&gt; src/libtmux/_internal/query_list.py:495:25
    |
494 |         if len(self) == len(data):
495 |             for a, b in zip(self, data):
    |                         ^^^^^^^^^^^^^^^
496 |                 if isinstance(a, Mapping):
497 |                     a_keys = a.keys()
    |
help: Add explicit value for parameter `strict=`

UP007 Use `X | Y` for type annotations
  --&gt; src/libtmux/_vendor/version.py:24:17
   |
22 | __all__ = ["VERSION_PATTERN", "InvalidVersion", "Version", "parse"]
23 |
24 | InfiniteTypes = t.Union[InfinityType, NegativeInfinityType]
   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
25 | PrePostDevType = t.Union[InfiniteTypes, tuple[str, int]]
26 | SubLocalType = t.Union[InfiniteTypes, int, str]
   |
help: Convert to `X | Y`

UP007 Use `X | Y` for type annotations
  --&gt; src/libtmux/_vendor/version.py:25:18
   |
24 | InfiniteTypes = t.Union[InfinityType, NegativeInfinityType]
25 | PrePostDevType = t.Union[InfiniteTypes, tuple[str, int]]
   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
26 | SubLocalType = t.Union[InfiniteTypes, int, str]
27 | LocalType = t.Union[
   |
help: Convert to `X | Y`

UP007 Use `X | Y` for type annotations
  --&gt; src/libtmux/_vendor/version.py:26:16
   |
24 | InfiniteTypes = t.Union[InfinityType, NegativeInfinityType]
25 | PrePostDevType = t.Union[InfinityTypes, tuple[str, int]]
26 | SubLocalType = t.Union[InfiniteTypes, int, str]
   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
27 | LocalType = t.Union[
28 |     NegativeInfinityType,
   |
help: Convert to `X | Y`

UP007 Use `X | Y` for type annotations
  --&gt; src/libtmux/_vendor/version.py:27:13
   |
25 |   PrePostDevType = t.Union[InfiniteTypes, tuple[str, int]]
26 |   SubLocalType = t.Union[InfiniteTypes, int, str]
27 |   LocalType = t.Union[
   |  _____________^
28 | |     NegativeInfinityType,
29 | |     tuple[
30 | |         SubLocalType | tuple[SubLocalType, str] | tuple[NegativeInfinityType, SubLocalType],
31 | |         ...,
32 | |     ],
33 | | ]
   | |^
34 |   CmpKey = tuple[
35 |       int,
   |
help: Convert to `X | Y`

E501 Line too long (92 &gt; 88)
  --&gt; src/libtmux/_vendor/version.py:30:89
   |
28 |     NegativeInfinityType,
29 |     tuple[
30 |         SubLocalType | tuple[SubLocalType, str] | tuple[NegativeInfinityType, SubLocalType],
   |                                                                                         ^^^^
31 |         ...,
32 |     ],
   |

UP045 Use `X | None` for type annotations
  --&gt; src/libtmux/neo.py:16:21
   |
14 | if t.TYPE_CHECKING:
15 |     ListCmd = t.Literal["list-sessions", "list-windows", "list-panes"]
16 |     ListExtraArgs = t.Optional[Iterable[str]]
   |                     ^^^^^^^^^^^^^^^^^^^^^^^^^
17 |
18 |     from libtmux.server import Server
   |
help: Convert to `X | None`

B905 `zip()` without an explicit `strict=` parameter
   --&gt; src/libtmux/neo.py:227:14
    |
226 |     obj_formatters = [
227 |         dict(zip(formats, formatter.split(FORMAT_SEPARATOR)))
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
228 |         for formatter in obj_output
229 |     ]
    |
help: Add explicit value for parameter `strict=`

B905 `zip()` without an explicit `strict=` parameter
   --&gt; src/libtmux/pane.py:707:32
    |
705 |         pane_output = pane_cmd.stdout[0]
706 |
707 |         pane_formatters = dict(zip(["pane_id"], pane_output.split(FORMAT_SEPARATOR)))
    |                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
708 |
709 |         return self.from_pane_id(server=self.server, pane_id=pane_formatters["pane_id"])
    |
help: Add explicit value for parameter `strict=`

UP036 Version block is outdated for minimum Python version
  --&gt; src/libtmux/server.py:41:8
   |
39 |     from libtmux._internal.types import StrPath
40 |
41 |     if sys.version_info &gt;= (3, 10):
   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
42 |         from typing import Self, TypeAlias
43 |     else:
   |
help: Remove outdated version block

B905 `zip()` without an explicit `strict=` parameter
   --&gt; src/libtmux/server.py:585:13
    |
584 |         session_formatters = dict(
585 |             zip(["session_id"], session_stdout.split(formats.FORMAT_SEPARATOR)),
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
586 |         )
    |
help: Add explicit value for parameter `strict=`

B905 `zip()` without an explicit `strict=` parameter
   --&gt; src/libtmux/session.py:734:13
    |
733 |         window_formatters = dict(
734 |             zip(["window_id"], window_output.split(FORMAT_SEPARATOR)),
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
735 |         )
    |
help: Add explicit value for parameter `strict=`

UP036 Version block is outdated for minimum Python version
  --&gt; tests/legacy_api/test_version.py:17:8
   |
15 |     from collections.abc import Callable
16 |
17 |     if sys.version_info &gt;= (3, 10):
   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
18 |         from typing import TypeAlias
19 |     else:
   |
help: Remove outdated version block

UP045 Use `X | None` for type annotations
  --&gt; tests/test_dataclasses.py:25:21
   |
24 |     ListCmd = t.Literal["list-sessions", "list-windows", "list-panes"]
25 |     ListExtraArgs = t.Optional[tuple[str]]
   |                     ^^^^^^^^^^^^^^^^^^^^^^
   |
help: Convert to `X | None`

UP036 Version block is outdated for minimum Python version
  --&gt; tests/test_version.py:17:8
   |
15 |     from collections.abc import Callable
16 |
17 |     if sys.version_info &gt;= (3, 10):
   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
18 |         from typing import TypeAlias
19 |     else:
   |
help: Remove outdated version block

Fixed 7 errors:
- src/libtmux/_internal/types.py:
    1 × I001 (unsorted-imports)
    1 × UP035 (deprecated-import)
- src/libtmux/_vendor/version.py:
    1 × UP007 (non-pep604-annotation-union)
- src/libtmux/server.py:
    1 × I001 (unsorted-imports)
    1 × UP035 (deprecated-import)
- tests/legacy_api/test_version.py:
    1 × UP035 (deprecated-import)
- tests/test_version.py:
    1 × UP035 (deprecated-import)

Found 22 errors (7 fixed, 15 remaining).
No fixes available (8 hidden fixes can be enabled with the `--unsafe-fixes` option).
diff --git a/src/libtmux/_internal/types.py b/src/libtmux/_internal/types.py
@@ -13,7 +13,6 @@
 
 if t.TYPE_CHECKING:
     from os import PathLike
-
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
 StrPath: TypeAlias = "str | PathLike[str]"
diff --git a/src/libtmux/_vendor/version.py b/src/libtmux/_vendor/version.py
@@ -27,11 +27,9 @@
 LocalType = t.Union[
     NegativeInfinityType,
     tuple[
-        t.Union[
-            SubLocalType,
-            tuple[SubLocalType, str],
-            tuple[NegativeInfinityType, SubLocalType],
-        ],
+        SubLocalType
+        | tuple[SubLocalType, str]
+        | tuple[NegativeInfinityType, SubLocalType],
         ...,
     ],
 ]
diff --git a/src/libtmux/server.py b/src/libtmux/server.py
@@ -41,7 +41,9 @@
     if sys.version_info >= (3, 10):
         from typing import Self, TypeAlias
     else:
-        from typing_extensions import Self, TypeAlias
+        from typing import TypeAlias
+
+        from typing_extensions import Self
 
     DashLiteral: TypeAlias = t.Literal["-"]
 
diff --git a/tests/legacy_api/test_version.py b/tests/legacy_api/test_version.py
@@ -17,7 +17,7 @@
     if sys.version_info >= (3, 10):
         from typing import TypeAlias
     else:
-        from typing_extensions import TypeAlias
+        from typing import TypeAlias
 
     try:
         from _pytest.raises import RaisesExc
diff --git a/tests/test_version.py b/tests/test_version.py
@@ -17,7 +17,7 @@
     if sys.version_info >= (3, 10):
         from typing import TypeAlias
     else:
-        from typing_extensions import TypeAlias
+        from typing import TypeAlias
 
     try:
         from _pytest.raises import RaisesExc
