Use packaging

Author: tony

src/libtmux/_compat.py

@@ -31,3 +31,9 @@ def str_from_console(s: t.Union[str, bytes]) -> str:
         return str(s)
     except UnicodeDecodeError:
         return str(s, encoding="utf_8") if isinstance(s, bytes) else s
+
+
+try:
+    from packaging.version import LegacyVersion as LooseVersion, Version  # type: ignore
+except ImportError:
+    from distutils.version import LooseVersion, Version

src/libtmux/common.py

@@ -11,7 +11,6 @@
 import subprocess
 import sys
 import typing as t
-from distutils.version import LooseVersion
 from typing import Dict, Generic, KeysView, List, Optional, TypeVar, Union, overload
 
 from . import exc
@@ -25,6 +24,9 @@
     from libtmux.window import Window
 
 
+from . import exc
+from ._compat import LooseVersion, console_to_str, str_from_console
+
 logger = logging.getLogger(__name__)
 
 
@@ -273,7 +275,7 @@ def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
 
 # class TmuxMappingObject(t.Mapping[str, t.Union[str,int,bool]]):
 class TmuxMappingObject(t.Mapping[t.Any, t.Any]):
-    r"""Base: :py:class:`MutableMapping`.
+    r"""Base: :py:class:`typing.Mapping`.
 
     Convenience container. Base class for :class:`Pane`, :class:`Window`,
     :class:`Session` and :class:`Server`.

tests/test_common.py

@@ -3,12 +3,12 @@
 import re
 import sys
 import typing as t
-from distutils.version import LooseVersion
 from typing import Optional
 
 import pytest
 
 import libtmux
+from libtmux._compat import LooseVersion
 from libtmux.common import (
     TMUX_MAX_VERSION,
     TMUX_MIN_VERSION,
@@ -43,7 +43,7 @@ def mock_tmux_cmd(*args: t.Any, **kwargs: t.Any) -> Hi:
     assert has_gte_version(TMUX_MIN_VERSION)
     assert has_gt_version(TMUX_MAX_VERSION), "Greater than the max-supported version"
     assert (
-        "%s-master" % TMUX_MAX_VERSION == get_version()
+        LooseVersion("%s-master" % TMUX_MAX_VERSION) == get_version()
     ), "Is the latest supported version with -master appended"
 
 
@@ -63,6 +63,7 @@ def mock_tmux_cmd(*args: t.Any, **kwargs: t.Any) -> Hi:
     assert has_gte_version(TMUX_MIN_VERSION)
     assert has_gt_version(TMUX_MAX_VERSION), "Greater than the max-supported version"
     assert TMUX_NEXT_VERSION == get_version()
+    assert LooseVersion("2.9") == get_version()
 
 
 def test_get_version_openbsd(monkeypatch: pytest.MonkeyPatch) -> None:
@@ -78,7 +79,7 @@ def mock_tmux_cmd(*args: t.Any, **kwargs: t.Any) -> Hi:
     assert has_gte_version(TMUX_MIN_VERSION)
     assert has_gt_version(TMUX_MAX_VERSION), "Greater than the max-supported version"
     assert (
-        "%s-openbsd" % TMUX_MAX_VERSION == get_version()
+        LooseVersion("%s-openbsd" % TMUX_MAX_VERSION) == get_version()
     ), "Is the latest supported version with -openbsd appended"