Revert "refactor(ruff,mypy) Adjust typing targets for Python 3.10"

This reverts commit 8fdb96f.

Author: tony

src/libtmux/_internal/query_list.py

@@ -492,7 +492,7 @@ def __eq__(
             return False
 
         if len(self) == len(data):
-            for a, b in zip(self, data, strict=False):
+            for a, b in zip(self, data):
                 if isinstance(a, Mapping):
                     a_keys = a.keys()
                     if a.keys == b.keys():

src/libtmux/_internal/types.py

@@ -13,6 +13,7 @@
 
 if t.TYPE_CHECKING:
     from os import PathLike
-    from typing import TypeAlias
+
+    from typing_extensions import TypeAlias
 
 StrPath: TypeAlias = "str | PathLike[str]"

src/libtmux/_vendor/version.py

@@ -21,20 +21,20 @@
 
 __all__ = ["VERSION_PATTERN", "InvalidVersion", "Version", "parse"]
 
-InfiniteTypes = InfinityType | NegativeInfinityType
-PrePostDevType = InfiniteTypes | tuple[str, int]
-SubLocalType = InfiniteTypes | int | str
-LocalType = (
-    NegativeInfinityType
-    | tuple[
-        (
-            SubLocalType
-            | tuple[SubLocalType, str]
-            | tuple[NegativeInfinityType, SubLocalType]
-        ),
+InfiniteTypes = t.Union[InfinityType, NegativeInfinityType]
+PrePostDevType = t.Union[InfiniteTypes, tuple[str, int]]
+SubLocalType = t.Union[InfiniteTypes, int, str]
+LocalType = t.Union[
+    NegativeInfinityType,
+    tuple[
+        t.Union[
+            SubLocalType,
+            tuple[SubLocalType, str],
+            tuple[NegativeInfinityType, SubLocalType],
+        ],
         ...,
-    ]
-)
+    ],
+]
 CmpKey = tuple[
     int,
     tuple[int, ...],

src/libtmux/neo.py

@@ -13,7 +13,7 @@
 
 if t.TYPE_CHECKING:
     ListCmd = t.Literal["list-sessions", "list-windows", "list-panes"]
-    ListExtraArgs = Iterable[str] | None
+    ListExtraArgs = t.Optional[Iterable[str]]
 
     from libtmux.server import Server
 
@@ -224,7 +224,7 @@ def fetch_objs(
     obj_output = proc.stdout
 
     obj_formatters = [
-        dict(zip(formats, formatter.split(FORMAT_SEPARATOR), strict=False))
+        dict(zip(formats, formatter.split(FORMAT_SEPARATOR)))
         for formatter in obj_output
     ]
 
@@ -237,7 +237,7 @@ def fetch_obj(
     obj_key: str,
     obj_id: str,
     list_cmd: ListCmd = "list-panes",
-    list_extra_args: ListExtraArgs = None,
+    list_extra_args: ListExtraArgs | None = None,
 ) -> OutputRaw:
     """Fetch raw data from tmux command."""
     obj_formatters_filtered = fetch_objs(

src/libtmux/pane.py

@@ -704,9 +704,7 @@ def split(
 
         pane_output = pane_cmd.stdout[0]
 
-        pane_formatters = dict(
-            zip(["pane_id"], pane_output.split(FORMAT_SEPARATOR), strict=False)
-        )
+        pane_formatters = dict(zip(["pane_id"], pane_output.split(FORMAT_SEPARATOR)))
 
         return self.from_pane_id(server=self.server, pane_id=pane_formatters["pane_id"])
 

src/libtmux/server.py

@@ -33,13 +33,16 @@
 )
 
 if t.TYPE_CHECKING:
+    import sys
     import types
-    from typing import TypeAlias
-
-    from typing_extensions import Self
 
     from libtmux._internal.types import StrPath
 
+    if sys.version_info >= (3, 10):
+        from typing import Self, TypeAlias
+    else:
+        from typing_extensions import Self, TypeAlias
+
     DashLiteral: TypeAlias = t.Literal["-"]
 
 logger = logging.getLogger(__name__)
@@ -577,11 +580,7 @@ def new_session(
             os.environ["TMUX"] = env
 
         session_formatters = dict(
-            zip(
-                ["session_id"],
-                session_stdout.split(formats.FORMAT_SEPARATOR),
-                strict=False,
-            ),
+            zip(["session_id"], session_stdout.split(formats.FORMAT_SEPARATOR)),
         )
 
         return Session.from_session_id(

src/libtmux/session.py

@@ -731,7 +731,7 @@ def new_window(
         window_output = cmd.stdout[0]
 
         window_formatters = dict(
-            zip(["window_id"], window_output.split(FORMAT_SEPARATOR), strict=False),
+            zip(["window_id"], window_output.split(FORMAT_SEPARATOR)),
         )
 
         return Window.from_window_id(

tests/legacy_api/test_version.py

@@ -11,8 +11,13 @@
 from libtmux._compat import LooseVersion
 
 if t.TYPE_CHECKING:
+    import sys
     from collections.abc import Callable
-    from typing import TypeAlias
+
+    if sys.version_info >= (3, 10):
+        from typing import TypeAlias
+    else:
+        from typing_extensions import TypeAlias
 
     try:
         from _pytest.raises import RaisesExc

tests/test_dataclasses.py

@@ -22,7 +22,7 @@
     from libtmux.server import Server
 
     ListCmd = t.Literal["list-sessions", "list-windows", "list-panes"]
-    ListExtraArgs = tuple[str] | None
+    ListExtraArgs = t.Optional[tuple[str]]
 
 
 OutputRaw = dict[str, t.Any]

tests/test_version.py

@@ -11,8 +11,13 @@
 from libtmux._compat import LooseVersion
 
 if t.TYPE_CHECKING:
+    import sys
     from collections.abc import Callable
-    from typing import TypeAlias
+
+    if sys.version_info >= (3, 10):
+        from typing import TypeAlias
+    else:
+        from typing_extensions import TypeAlias
 
     try:
         from _pytest.raises import RaisesExc