fix!(which): Move to shutil.which per libtmux v0.15.0a1

Author: tony

tmuxp/cli/debug_info.py

@@ -1,12 +1,13 @@
 import os
 import pathlib
 import platform
+import shutil
 import sys
 
 import click
 
 from libtmux import __version__ as libtmux_version
-from libtmux.common import get_version, tmux_cmd, which
+from libtmux.common import get_version, tmux_cmd
 
 from ..__about__ import __version__
 from .utils import tmuxp_echo
@@ -62,7 +63,7 @@ def format_tmux_resp(std_resp):
         "tmux version: %s" % get_version(),
         "libtmux version: %s" % libtmux_version,
         "tmuxp version: %s" % __version__,
-        "tmux path: %s" % which("tmux"),
+        "tmux path: %s" % shutil.which("tmux"),
         "tmuxp path: %s" % tmuxp_path,
         "shell: %s" % os.environ["SHELL"],
         output_break(),

tmuxp/cli/load.py

@@ -8,13 +8,14 @@
 import logging
 import os
 import pathlib
+import shutil
 import sys
 from typing import List
 
 import click
 import kaptan
 
-from libtmux.common import has_gte_version, which
+from libtmux.common import has_gte_version
 from libtmux.server import Server
 
 from .. import config, exc, log, util
@@ -357,7 +358,7 @@ def load_workspace(
         colors=colors,
     )
 
-    which("tmux")  # raise exception if tmux not found
+    shutil.which("tmux")  # raise exception if tmux not found
 
     try:  # load WorkspaceBuilder object for tmuxp config / tmux server
         builder = WorkspaceBuilder(

tmuxp/conftest.py

@@ -2,6 +2,7 @@
 import logging
 import os
 import pathlib
+import shutil
 import typing as t
 
 import pytest
@@ -10,7 +11,6 @@
 from _pytest.fixtures import SubRequest
 
 from libtmux import exc
-from libtmux.common import which
 from libtmux.server import Server
 from libtmux.test import TEST_SESSION_PREFIX, get_test_session_name, namer
 from tests.fixtures import utils as test_utils
@@ -140,7 +140,7 @@ def add_doctest_fixtures(
     request: SubRequest,
     doctest_namespace: t.Dict[str, t.Any],
 ) -> None:
-    if isinstance(request._pyfuncitem, DoctestItem) and which("tmux"):
+    if isinstance(request._pyfuncitem, DoctestItem) and shutil.which("tmux"):
         doctest_namespace["server"] = request.getfixturevalue("server")
         session: "Session" = request.getfixturevalue("session")
         doctest_namespace["session"] = session