diff --git a/src/libtmux/server.py b/src/libtmux/server.py index 511329470..e022965ab 100644 --- a/src/libtmux/server.py +++ b/src/libtmux/server.py @@ -35,9 +35,13 @@ ) if t.TYPE_CHECKING: + import sys import types - from typing_extensions import TypeAlias + if sys.version_info >= (3, 10): + from typing import TypeAlias + else: + from typing_extensions import TypeAlias DashLiteral: TypeAlias = t.Literal["-"] diff --git a/src/libtmux/test.py b/src/libtmux/test.py index 4c5f32efd..2bbaa2e53 100644 --- a/src/libtmux/test.py +++ b/src/libtmux/test.py @@ -15,15 +15,20 @@ logger = logging.getLogger(__name__) if t.TYPE_CHECKING: + import sys import types from collections.abc import Callable, Generator - from typing_extensions import Self - from libtmux.server import Server from libtmux.session import Session from libtmux.window import Window + if sys.version_info >= (3, 11): + from typing import Self + else: + from typing_extensions import Self + + TEST_SESSION_PREFIX = "libtmux_" RETRY_TIMEOUT_SECONDS = int(os.getenv("RETRY_TIMEOUT_SECONDS", 8)) RETRY_INTERVAL_SECONDS = float(os.getenv("RETRY_INTERVAL_SECONDS", 0.05)) diff --git a/tests/legacy_api/test_version.py b/tests/legacy_api/test_version.py index d968f20a2..f702a2c81 100644 --- a/tests/legacy_api/test_version.py +++ b/tests/legacy_api/test_version.py @@ -11,10 +11,15 @@ from libtmux._compat import LooseVersion if t.TYPE_CHECKING: + import sys from collections.abc import Callable from _pytest.python_api import RaisesContext - from typing_extensions import TypeAlias + + if sys.version_info >= (3, 10): + from typing import TypeAlias + else: + from typing_extensions import TypeAlias VersionCompareOp: TypeAlias = Callable[ [t.Any, t.Any], diff --git a/tests/test_version.py b/tests/test_version.py index d968f20a2..f702a2c81 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -11,10 +11,15 @@ from libtmux._compat import LooseVersion if t.TYPE_CHECKING: + import sys from collections.abc import Callable from _pytest.python_api import RaisesContext - from typing_extensions import TypeAlias + + if sys.version_info >= (3, 10): + from typing import TypeAlias + else: + from typing_extensions import TypeAlias VersionCompareOp: TypeAlias = Callable[ [t.Any, t.Any],