chore(ruff): Autofixes for ruff with Python 3.10+

uv run ruff check . --fix --show-fixes

Fixed 20 errors:
- src/tmuxp/_internal/config_reader.py:
    1 × UP035 (deprecated-import)
- src/tmuxp/cli/__init__.py:
    1 × I001 (unsorted-imports)
    1 × UP035 (deprecated-import)
- src/tmuxp/cli/freeze.py:
    1 × UP035 (deprecated-import)
- src/tmuxp/cli/load.py:
    1 × I001 (unsorted-imports)
    1 × UP035 (deprecated-import)
- src/tmuxp/cli/shell.py:
    1 × UP035 (deprecated-import)
- src/tmuxp/cli/utils.py:
    1 × UP007 (non-pep604-annotation-union)
    1 × I001 (unsorted-imports)
    1 × UP035 (deprecated-import)
- src/tmuxp/plugin.py:
    1 × I001 (unsorted-imports)
    1 × UP035 (deprecated-import)
- src/tmuxp/shell.py:
    1 × I001 (unsorted-imports)
    1 × UP035 (deprecated-import)
- src/tmuxp/workspace/finders.py:
    1 × I001 (unsorted-imports)
    1 × UP035 (deprecated-import)
- tests/cli/test_load.py:
    1 × UP007 (non-pep604-annotation-union)
    1 × UP035 (deprecated-import)
    1 × I001 (unsorted-imports)
    1 × UP045 (non-pep604-annotation-optional)

Found 24 errors (20 fixed, 4 remaining).
No fixes available (4 hidden fixes can be enabled with the `--unsafe-fixes` option).

Author: tony

src/tmuxp/_internal/config_reader.py

@@ -9,7 +9,7 @@
 import yaml
 
 if t.TYPE_CHECKING:
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
     FormatLiteral = t.Literal["json", "yaml"]
 

src/tmuxp/cli/__init__.py

@@ -34,8 +34,7 @@
 
 if t.TYPE_CHECKING:
     import pathlib
-
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
     CLIVerbosity: TypeAlias = t.Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
     CLISubparserName: TypeAlias = t.Literal[

src/tmuxp/cli/freeze.py

@@ -20,7 +20,7 @@
 from .utils import prompt, prompt_choices, prompt_yes_no
 
 if t.TYPE_CHECKING:
-    from typing_extensions import TypeAlias, TypeGuard
+    from typing import TypeAlias, TypeGuard
 
     CLIOutputFormatLiteral: TypeAlias = t.Literal["yaml", "json"]
 

src/tmuxp/cli/load.py

@@ -22,8 +22,10 @@
 from .utils import prompt_choices, prompt_yes_no, style, tmuxp_echo
 
 if t.TYPE_CHECKING:
+    from typing import TypeAlias
+
     from libtmux.session import Session
-    from typing_extensions import NotRequired, TypeAlias, TypedDict
+    from typing_extensions import NotRequired, TypedDict
 
     from tmuxp.types import StrPath
 

src/tmuxp/cli/shell.py

@@ -13,7 +13,7 @@
 from tmuxp._compat import PY3, PYMINOR
 
 if t.TYPE_CHECKING:
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
     CLIColorsLiteral: TypeAlias = t.Literal[56, 88]
     CLIShellLiteral: TypeAlias = t.Literal[

src/tmuxp/cli/utils.py

@@ -10,10 +10,9 @@
 
 if t.TYPE_CHECKING:
     from collections.abc import Callable, Sequence
+    from typing import TypeAlias
 
-    from typing_extensions import TypeAlias
-
-    CLIColour: TypeAlias = t.Union[int, tuple[int, int, int], str]
+    CLIColour: TypeAlias = int | tuple[int, int, int] | str
 
 
 logger = logging.getLogger(__name__)

src/tmuxp/plugin.py

@@ -31,9 +31,11 @@
 
 
 if t.TYPE_CHECKING:
+    from typing import TypeGuard
+
     from libtmux.session import Session
     from libtmux.window import Window
-    from typing_extensions import TypedDict, TypeGuard, Unpack
+    from typing_extensions import TypedDict, Unpack
 
     from ._internal.types import PluginConfigSchema
 

src/tmuxp/shell.py

@@ -13,12 +13,13 @@
 if t.TYPE_CHECKING:
     from collections.abc import Callable
     from types import ModuleType
+    from typing import TypeAlias
 
     from libtmux.pane import Pane
     from libtmux.server import Server
     from libtmux.session import Session
     from libtmux.window import Window
-    from typing_extensions import NotRequired, TypeAlias, TypedDict, Unpack
+    from typing_extensions import NotRequired, TypedDict, Unpack
 
     CLIShellLiteral: TypeAlias = t.Literal[
         "best",

src/tmuxp/workspace/finders.py

@@ -15,8 +15,7 @@
 
 if t.TYPE_CHECKING:
     import pathlib
-
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
     from tmuxp.types import StrPath
 

tests/cli/test_load.py

@@ -186,10 +186,11 @@ def test_load_symlinked_workspace(
 
 
 if t.TYPE_CHECKING:
+    from typing import TypeAlias
+
     from pytest_mock import MockerFixture
-    from typing_extensions import TypeAlias
 
-    ExpectedOutput: TypeAlias = t.Optional[t.Union[str, list[str]]]
+    ExpectedOutput: TypeAlias = str | list[str] | None
 
 
 class CLILoadFixture(t.NamedTuple):