chore(ruff) Automated fixes for typing annotations

Fixed 606 errors: - conftest.py: 1 × TC003 (typing-only-standard-library-import) 1 × I002 (missing-required-import) - docs/conf.py: 2 × UP007 (non-pep604-annotation) 2 × UP037 (quoted-annotation) 1 × I002 (missing-required-import) - src/libtmux/__about__.py: 1 × I002 (missing-required-import) - src/libtmux/__init__.py: 1 × I002 (missing-required-import) - src/libtmux/_internal/dataclasses.py: 1 × UP037 (quoted-annotation) 1 × I002 (missing-required-import) - src/libtmux/_internal/query_list.py: 47 × UP037 (quoted-annotation) 37 × UP007 (non-pep604-annotation) 1 × I002 (missing-required-import) - src/libtmux/_vendor/_structures.py: 1 × I002 (missing-required-import) 1 × UP037 (quoted-annotation) - src/libtmux/_vendor/version.py: 12 × UP007 (non-pep604-annotation) 5 × UP037 (quoted-annotation) 1 × F401 (unused-import) 1 × I002 (missing-required-import) - src/libtmux/common.py: 8 × UP007 (non-pep604-annotation) 2 × F401 (unused-import) 1 × UP037 (quoted-annotation) 1 × I002 (missing-required-import) 1 × TC003 (typing-only-standard-library-import) - src/libtmux/constants.py: 1 × I002 (missing-required-import) - src/libtmux/exc.py: 7 × UP007 (non-pep604-annotation) 1 × UP037 (quoted-annotation) 1 × I002 (missing-required-import) - src/libtmux/formats.py: 1 × I002 (missing-required-import) - src/libtmux/neo.py: 129 × UP007 (non-pep604-annotation) 9 × UP037 (quoted-annotation) 1 × I002 (missing-required-import) - src/libtmux/pane.py: 55 × UP007 (non-pep604-annotation) 20 × UP037 (quoted-annotation) 2 × Q000 (bad-quotes-inline-string) 1 × I002 (missing-required-import) - src/libtmux/pytest_plugin.py: 1 × UP037 (quoted-annotation) 1 × TC003 (typing-only-standard-library-import) 1 × I002 (missing-required-import) 1 × I001 (unsorted-imports) - src/libtmux/server.py: 23 × UP007 (non-pep604-annotation) 7 × UP037 (quoted-annotation) 1 × I002 (missing-required-import) - src/libtmux/session.py: 29 × UP007 (non-pep604-annotation) 20 × UP037 (quoted-annotation) 1 × I002 (missing-required-import) 1 × TC001 (typing-only-first-party-import) 1 × I001 (unsorted-imports) - src/libtmux/test.py: 7 × UP037 (quoted-annotation) 5 × UP007 (non-pep604-annotation) 3 × I001 (unsorted-imports) 2 × TC003 (typing-only-standard-library-import) 1 × F401 (unused-import) 1 × I002 (missing-required-import) 1 × TC001 (typing-only-first-party-import) 1 × PYI034 (non-self-return-type) - src/libtmux/window.py: 52 × UP007 (non-pep604-annotation) 22 × UP037 (quoted-annotation) 1 × I002 (missing-required-import) - tests/_internal/test_query_list.py: 3 × UP007 (non-pep604-annotation) 1 × I002 (missing-required-import) 1 × I001 (unsorted-imports) 1 × TC003 (typing-only-standard-library-import) - tests/legacy_api/test_common.py: 4 × UP007 (non-pep604-annotation) 1 × TC001 (typing-only-first-party-import) 1 × I002 (missing-required-import) - tests/legacy_api/test_pane.py: 1 × I001 (unsorted-imports) 1 × I002 (missing-required-import) 1 × TC001 (typing-only-first-party-import) - tests/legacy_api/test_server.py: 1 × I001 (unsorted-imports) 1 × I002 (missing-required-import) 1 × TC001 (typing-only-first-party-import) - tests/legacy_api/test_session.py: 1 × I001 (unsorted-imports) 1 × TC001 (typing-only-first-party-import) 1 × I002 (missing-required-import) - tests/legacy_api/test_tmuxobject.py: 1 × I001 (unsorted-imports) 1 × TC001 (typing-only-first-party-import) 1 × I002 (missing-required-import) - tests/legacy_api/test_version.py: 2 × UP007 (non-pep604-annotation) 2 × UP037 (quoted-annotation) 1 × I002 (missing-required-import) - tests/legacy_api/test_window.py: 1 × I001 (unsorted-imports) 1 × TC001 (typing-only-first-party-import) 1 × I002 (missing-required-import) - tests/test_common.py: 4 × UP007 (non-pep604-annotation) 1 × I002 (missing-required-import) 1 × TC001 (typing-only-first-party-import) - tests/test_dataclasses.py: 1 × TC003 (typing-only-standard-library-import) 1 × TC001 (typing-only-first-party-import) 1 × I002 (missing-required-import) 1 × I001 (unsorted-imports) - tests/test_pane.py: 1 × I001 (unsorted-imports) 1 × I002 (missing-required-import) 1 × TC001 (typing-only-first-party-import) - tests/test_pytest_plugin.py: 1 × I001 (unsorted-imports) 1 × I002 (missing-required-import) 1 × TC002 (typing-only-third-party-import) - tests/test_server.py: 1 × I001 (unsorted-imports) 1 × TC001 (typing-only-first-party-import) 1 × I002 (missing-required-import) - tests/test_session.py: 1 × TC001 (typing-only-first-party-import) 1 × I002 (missing-required-import) - tests/test_test.py: 1 × I002 (missing-required-import) - tests/test_tmuxobject.py: 1 × I001 (unsorted-imports) 1 × TC001 (typing-only-first-party-import) 1 × I002 (missing-required-import) - tests/test_version.py: 2 × UP007 (non-pep604-annotation) 2 × UP037 (quoted-annotation) 1 × I002 (missing-required-import) - tests/test_window.py: 1 × I001 (unsorted-imports) 1 × I002 (missing-required-import) 1 × TC001 (typing-only-first-party-import) Found 1976 errors (606 fixed, 1370 remaining). 35 files reformatted, 9 files left unchanged uv run ruff check --select ALL . --fix --unsafe-fixes --preview --show-fixes; uv run ruff format .
tmux-python · Jan 4, 2025 · 2863201 · 2863201
1 parent 54edeea
commit 2863201
Show file tree

Hide file tree

Showing 37 changed files with 573 additions and 459 deletions.
diff --git a/conftest.py b/conftest.py
@@ -8,7 +8,8 @@
 https://docs.pytest.org/en/stable/deprecations.html
 """
 
-import pathlib
+from __future__ import annotations
+
 import shutil
 import typing as t
 
@@ -21,6 +22,9 @@
 from libtmux.session import Session
 from libtmux.window import Window
 
+if t.TYPE_CHECKING:
+    import pathlib
+
 pytest_plugins = ["pytester"]
 
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -1,6 +1,8 @@
 # flake8: NOQA: E501
 """Sphinx configuration for libtmux."""
 
+from __future__ import annotations
+
 import contextlib
 import inspect
 import pathlib
@@ -72,7 +74,7 @@
 html_extra_path = ["manifest.json"]
 html_theme = "furo"
 html_theme_path: list[str] = []
-html_theme_options: dict[str, t.Union[str, list[dict[str, str]]]] = {
+html_theme_options: dict[str, str | list[dict[str, str]]] = {
     "light_logo": "img/libtmux.svg",
     "dark_logo": "img/libtmux.svg",
     "footer_icons": [
@@ -138,7 +140,7 @@
 }
 
 
-def linkcode_resolve(domain: str, info: dict[str, str]) -> t.Union[None, str]:
+def linkcode_resolve(domain: str, info: dict[str, str]) -> None | str:
     """
     Determine the URL corresponding to Python object.
 
@@ -208,7 +210,7 @@ def linkcode_resolve(domain: str, info: dict[str, str]) -> t.Union[None, str]:
     )
 
 
-def remove_tabs_js(app: "Sphinx", exc: Exception) -> None:
+def remove_tabs_js(app: Sphinx, exc: Exception) -> None:
     """Remove tabs.js from _static after build."""
     # Fix for sphinx-inline-tabs#18
     if app.builder.format == "html" and not exc:
@@ -217,6 +219,6 @@ def remove_tabs_js(app: "Sphinx", exc: Exception) -> None:
             tabs_js.unlink()  # When python 3.7 deprecated, use missing_ok=True
 
 
-def setup(app: "Sphinx") -> None:
+def setup(app: Sphinx) -> None:
     """Configure Sphinx app hooks."""
     app.connect("build-finished", remove_tabs_js)
diff --git a/src/libtmux/__about__.py b/src/libtmux/__about__.py
@@ -1,5 +1,7 @@
 """Metadata package for libtmux."""
 
+from __future__ import annotations
+
 __title__ = "libtmux"
 __package_name__ = "libtmux"
 __version__ = "0.40.1"

diff --git a/src/libtmux/__init__.py b/src/libtmux/__init__.py
@@ -1,5 +1,7 @@
 """libtmux, a typed, pythonic API wrapper for the tmux terminal multiplexer."""
 
+from __future__ import annotations
+
 from .__about__ import (
     __author__,
     __copyright__,

diff --git a/src/libtmux/_internal/dataclasses.py b/src/libtmux/_internal/dataclasses.py
@@ -5,6 +5,8 @@
 This is an internal API not covered by versioning policy.
 """
 
+from __future__ import annotations
+
 import dataclasses
 import typing as t
 from operator import attrgetter
@@ -78,7 +80,7 @@ class SkipDefaultFieldsReprMixin:
     ItemWithMixin(name=Test, unit_price=2.05)
     """
 
-    def __repr__(self: "DataclassInstance") -> str:
+    def __repr__(self: DataclassInstance) -> str:
         """Omit default fields in object representation."""
         nodef_f_vals = (
             (f.name, attrgetter(f.name)(self))

diff --git a/src/libtmux/_internal/query_list.py b/src/libtmux/_internal/query_list.py
@@ -5,6 +5,8 @@
 This is an internal API not covered by versioning policy.
 """
 
+from __future__ import annotations
+
 import logging
 import re
 import traceback
@@ -20,8 +22,8 @@ class LookupProtocol(t.Protocol):
 
         def __call__(
             self,
-            data: t.Union[str, list[str], "Mapping[str, str]"],
-            rhs: t.Union[str, list[str], "Mapping[str, str]", "re.Pattern[str]"],
+            data: str | list[str] | Mapping[str, str],
+            rhs: str | list[str] | Mapping[str, str] | re.Pattern[str],
         ) -> bool:
             """Return callback for :class:`QueryList` filtering operators."""
             ...
@@ -41,9 +43,9 @@ class ObjectDoesNotExist(Exception):
 
 
 def keygetter(
-    obj: "Mapping[str, t.Any]",
+    obj: Mapping[str, t.Any],
     path: str,
-) -> t.Union[None, t.Any, str, list[str], "Mapping[str, str]"]:
+) -> None | t.Any | str | list[str] | Mapping[str, str]:
     """Fetch values in objects and keys, supported nested data.
 
     **With dictionaries**:
@@ -112,10 +114,10 @@ def keygetter(
 
 
 def parse_lookup(
-    obj: "Mapping[str, t.Any]",
+    obj: Mapping[str, t.Any],
     path: str,
     lookup: str,
-) -> t.Optional[t.Any]:
+) -> t.Any | None:
     """Check if field lookup key, e.g. "my__path__contains" has comparator, return val.
 
     If comparator not used or value not found, return None.
@@ -151,15 +153,15 @@ def parse_lookup(
 
 
 def lookup_exact(
-    data: t.Union[str, list[str], "Mapping[str, str]"],
-    rhs: t.Union[str, list[str], "Mapping[str, str]", "re.Pattern[str]"],
+    data: str | list[str] | Mapping[str, str],
+    rhs: str | list[str] | Mapping[str, str] | re.Pattern[str],
 ) -> bool:
     return rhs == data
 
 
 def lookup_iexact(
-    data: t.Union[str, list[str], "Mapping[str, str]"],
-    rhs: t.Union[str, list[str], "Mapping[str, str]", "re.Pattern[str]"],
+    data: str | list[str] | Mapping[str, str],
+    rhs: str | list[str] | Mapping[str, str] | re.Pattern[str],
 ) -> bool:
     if not isinstance(rhs, str) or not isinstance(data, str):
         return False
@@ -168,8 +170,8 @@ def lookup_iexact(
 
 
 def lookup_contains(
-    data: t.Union[str, list[str], "Mapping[str, str]"],
-    rhs: t.Union[str, list[str], "Mapping[str, str]", "re.Pattern[str]"],
+    data: str | list[str] | Mapping[str, str],
+    rhs: str | list[str] | Mapping[str, str] | re.Pattern[str],
 ) -> bool:
     if not isinstance(rhs, str) or not isinstance(data, (str, Mapping, list)):
         return False
@@ -178,8 +180,8 @@ def lookup_contains(
 
 
 def lookup_icontains(
-    data: t.Union[str, list[str], "Mapping[str, str]"],
-    rhs: t.Union[str, list[str], "Mapping[str, str]", "re.Pattern[str]"],
+    data: str | list[str] | Mapping[str, str],
+    rhs: str | list[str] | Mapping[str, str] | re.Pattern[str],
 ) -> bool:
     if not isinstance(rhs, str) or not isinstance(data, (str, Mapping, list)):
         return False
@@ -193,8 +195,8 @@ def lookup_icontains(
 
 
 def lookup_startswith(
-    data: t.Union[str, list[str], "Mapping[str, str]"],
-    rhs: t.Union[str, list[str], "Mapping[str, str]", "re.Pattern[str]"],
+    data: str | list[str] | Mapping[str, str],
+    rhs: str | list[str] | Mapping[str, str] | re.Pattern[str],
 ) -> bool:
     if not isinstance(rhs, str) or not isinstance(data, str):
         return False
@@ -203,8 +205,8 @@ def lookup_startswith(
 
 
 def lookup_istartswith(
-    data: t.Union[str, list[str], "Mapping[str, str]"],
-    rhs: t.Union[str, list[str], "Mapping[str, str]", "re.Pattern[str]"],
+    data: str | list[str] | Mapping[str, str],
+    rhs: str | list[str] | Mapping[str, str] | re.Pattern[str],
 ) -> bool:
     if not isinstance(rhs, str) or not isinstance(data, str):
         return False
@@ -213,8 +215,8 @@ def lookup_istartswith(
 
 
 def lookup_endswith(
-    data: t.Union[str, list[str], "Mapping[str, str]"],
-    rhs: t.Union[str, list[str], "Mapping[str, str]", "re.Pattern[str]"],
+    data: str | list[str] | Mapping[str, str],
+    rhs: str | list[str] | Mapping[str, str] | re.Pattern[str],
 ) -> bool:
     if not isinstance(rhs, str) or not isinstance(data, str):
         return False
@@ -223,17 +225,17 @@ def lookup_endswith(
 
 
 def lookup_iendswith(
-    data: t.Union[str, list[str], "Mapping[str, str]"],
-    rhs: t.Union[str, list[str], "Mapping[str, str]", "re.Pattern[str]"],
+    data: str | list[str] | Mapping[str, str],
+    rhs: str | list[str] | Mapping[str, str] | re.Pattern[str],
 ) -> bool:
     if not isinstance(rhs, str) or not isinstance(data, str):
         return False
     return data.lower().endswith(rhs.lower())
 
 
 def lookup_in(
-    data: t.Union[str, list[str], "Mapping[str, str]"],
-    rhs: t.Union[str, list[str], "Mapping[str, str]", "re.Pattern[str]"],
+    data: str | list[str] | Mapping[str, str],
+    rhs: str | list[str] | Mapping[str, str] | re.Pattern[str],
 ) -> bool:
     if isinstance(rhs, list):
         return data in rhs
@@ -254,8 +256,8 @@ def lookup_in(
 
 
 def lookup_nin(
-    data: t.Union[str, list[str], "Mapping[str, str]"],
-    rhs: t.Union[str, list[str], "Mapping[str, str]", "re.Pattern[str]"],
+    data: str | list[str] | Mapping[str, str],
+    rhs: str | list[str] | Mapping[str, str] | re.Pattern[str],
 ) -> bool:
     if isinstance(rhs, list):
         return data not in rhs
@@ -276,24 +278,24 @@ def lookup_nin(
 
 
 def lookup_regex(
-    data: t.Union[str, list[str], "Mapping[str, str]"],
-    rhs: t.Union[str, list[str], "Mapping[str, str]", "re.Pattern[str]"],
+    data: str | list[str] | Mapping[str, str],
+    rhs: str | list[str] | Mapping[str, str] | re.Pattern[str],
 ) -> bool:
     if isinstance(data, (str, bytes, re.Pattern)) and isinstance(rhs, (str, bytes)):
         return bool(re.search(rhs, data))
     return False
 
 
 def lookup_iregex(
-    data: t.Union[str, list[str], "Mapping[str, str]"],
-    rhs: t.Union[str, list[str], "Mapping[str, str]", "re.Pattern[str]"],
+    data: str | list[str] | Mapping[str, str],
+    rhs: str | list[str] | Mapping[str, str] | re.Pattern[str],
 ) -> bool:
     if isinstance(data, (str, bytes, re.Pattern)) and isinstance(rhs, (str, bytes)):
         return bool(re.search(rhs, data, re.IGNORECASE))
     return False
 
 
-LOOKUP_NAME_MAP: 'Mapping[str, "LookupProtocol"]' = {
+LOOKUP_NAME_MAP: Mapping[str, LookupProtocol] = {
     "eq": lookup_exact,
     "exact": lookup_exact,
     "iexact": lookup_iexact,
@@ -469,10 +471,10 @@ class QueryList(list[T], t.Generic[T]):
     []
     """
 
-    data: "Sequence[T]"
-    pk_key: t.Optional[str]
+    data: Sequence[T]
+    pk_key: str | None
 
-    def __init__(self, items: t.Optional["Iterable[T]"] = None) -> None:
+    def __init__(self, items: Iterable[T] | None = None) -> None:
         super().__init__(items if items is not None else [])
 
     def items(self) -> list[tuple[str, T]]:
@@ -505,9 +507,9 @@ def __eq__(
 
     def filter(
         self,
-        matcher: t.Optional[t.Union[Callable[[T], bool], T]] = None,
+        matcher: Callable[[T], bool] | T | None = None,
         **kwargs: t.Any,
-    ) -> "QueryList[T]":
+    ) -> QueryList[T]:
         """Filter list of objects."""
 
         def filter_lookup(obj: t.Any) -> bool:
@@ -534,7 +536,7 @@ def filter_lookup(obj: t.Any) -> bool:
             filter_ = matcher
         elif matcher is not None:
 
-            def val_match(obj: t.Union[str, list[t.Any], T]) -> bool:
+            def val_match(obj: str | list[t.Any] | T) -> bool:
                 if isinstance(matcher, list):
                     return obj in matcher
                 return bool(obj == matcher)
@@ -547,10 +549,10 @@ def val_match(obj: t.Union[str, list[t.Any], T]) -> bool:
 
     def get(
         self,
-        matcher: t.Optional[t.Union[Callable[[T], bool], T]] = None,
-        default: t.Optional[t.Any] = no_arg,
+        matcher: Callable[[T], bool] | T | None = None,
+        default: t.Any | None = no_arg,
         **kwargs: t.Any,
-    ) -> t.Optional[T]:
+    ) -> T | None:
         """Retrieve one object.
 
         Raises :exc:`MultipleObjectsReturned` if multiple objects found.

diff --git a/src/libtmux/_vendor/_structures.py b/src/libtmux/_vendor/_structures.py
@@ -2,6 +2,7 @@
 # This file is dual licensed under the terms of the Apache License, Version
 # 2.0, and the BSD License. See the LICENSE file in the root of this repository
 # for complete details.
+from __future__ import annotations
 
 
 class InfinityType:
@@ -26,7 +27,7 @@ def __gt__(self, other: object) -> bool:
     def __ge__(self, other: object) -> bool:
         return True
 
-    def __neg__(self: object) -> "NegativeInfinityType":
+    def __neg__(self: object) -> NegativeInfinityType:
         return NegativeInfinity