Revert "fix(typings) Move typing-extensions into TypeGuard"

This reverts commit cc4e888.

Author: tony

src/libtmux/pane.py

@@ -13,6 +13,8 @@
 import typing as t
 import warnings
 
+from typing_extensions import Self
+
 from libtmux.common import has_gte_version, has_lt_version, tmux_cmd
 from libtmux.constants import (
     PANE_DIRECTION_FLAG_MAP,
@@ -26,17 +28,12 @@
 from . import exc
 
 if t.TYPE_CHECKING:
-    import sys
     import types
 
     from .server import Server
     from .session import Session
     from .window import Window
 
-    if sys.version_info >= (3, 11):
-        from typing import Self
-    else:
-        from typing_extensions import Self
 
 logger = logging.getLogger(__name__)
 

src/libtmux/server.py

@@ -15,6 +15,8 @@
 import typing as t
 import warnings
 
+from typing_extensions import Self
+
 from libtmux._internal.query_list import QueryList
 from libtmux.common import tmux_cmd
 from libtmux.neo import fetch_objs
@@ -37,9 +39,9 @@
     import types
 
     if sys.version_info >= (3, 10):
-        from typing import Self, TypeAlias
+        from typing import TypeAlias
     else:
-        from typing_extensions import Self, TypeAlias
+        from typing_extensions import TypeAlias
 
     DashLiteral: TypeAlias = t.Literal["-"]
 

src/libtmux/session.py

@@ -13,6 +13,8 @@
 import typing as t
 import warnings
 
+from typing_extensions import Self
+
 from libtmux._internal.query_list import QueryList
 from libtmux.constants import WINDOW_DIRECTION_FLAG_MAP, WindowDirection
 from libtmux.formats import FORMAT_SEPARATOR
@@ -31,16 +33,10 @@
 )
 
 if t.TYPE_CHECKING:
-    import sys
     import types
 
     from libtmux.common import tmux_cmd
 
-    if sys.version_info >= (3, 11):
-        from typing import Self
-    else:
-        from typing_extensions import Self
-
     from .server import Server
 
 

src/libtmux/window.py

@@ -13,6 +13,8 @@
 import typing as t
 import warnings
 
+from typing_extensions import Self
+
 from libtmux._internal.query_list import QueryList
 from libtmux.common import has_gte_version, tmux_cmd
 from libtmux.constants import (
@@ -28,18 +30,11 @@
 from .common import PaneDict, WindowOptionDict, handle_option_error
 
 if t.TYPE_CHECKING:
-    import sys
     import types
 
     from .server import Server
     from .session import Session
 
-    if sys.version_info >= (3, 11):
-        from typing import Self
-    else:
-        from typing_extensions import Self
-
-
 logger = logging.getLogger(__name__)