Always use shutil.which()

vstinner · vstinner · commit 89f2afd69112 · 2020-03-19T15:30:49.000+01:00
diff --git a/pyperformance/cli.py b/pyperformance/cli.py
@@ -1,8 +1,9 @@
 import argparse
 import os.path
+import shutil
 import sys
 
-from pyperformance.venv import exec_in_virtualenv, which, cmd_venv
+from pyperformance.venv import exec_in_virtualenv, cmd_venv
 
 
 def comma_separated(values):
@@ -167,7 +168,7 @@ def parse_args():
         # Replace "~" with the user home directory
         options.python = os.path.expanduser(options.python)
         # Try to the absolute path to the binary
-        abs_python = which(options.python)
+        abs_python = shutil.which(options.python)
         if not abs_python:
             print("ERROR: Unable to locate the Python executable: %r" %
                   options.python)
diff --git a/pyperformance/venv.py b/pyperformance/venv.py
@@ -15,75 +15,6 @@
 REQ_OLD_PIP = 'pip==7.1.2'
 REQ_OLD_SETUPTOOLS = 'setuptools==18.5'
 
-
-try:
-    # Python 3.3
-    from shutil import which
-except ImportError:
-    # Backport shutil.which() from Python 3.6
-    def which(cmd, mode=os.F_OK | os.X_OK, path=None):
-        """Given a command, mode, and a PATH string, return the path which
-        conforms to the given mode on the PATH, or None if there is no such
-        file.
-
-        `mode` defaults to os.F_OK | os.X_OK. `path` defaults to the result
-        of os.environ.get("PATH"), or can be overridden with a custom search
-        path.
-
-        """
-        # Check that a given file can be accessed with the correct mode.
-        # Additionally check that `file` is not a directory, as on Windows
-        # directories pass the os.access check.
-        def _access_check(fn, mode):
-            return (os.path.exists(fn) and os.access(fn, mode)
-                    and not os.path.isdir(fn))
-
-        # If we're given a path with a directory part, look it up directly rather
-        # than referring to PATH directories. This includes checking relative to the
-        # current directory, e.g. ./script
-        if os.path.dirname(cmd):
-            if _access_check(cmd, mode):
-                return cmd
-            return None
-
-        if path is None:
-            path = os.environ.get("PATH", os.defpath)
-        if not path:
-            return None
-        path = path.split(os.pathsep)
-
-        if sys.platform == "win32":
-            # The current directory takes precedence on Windows.
-            if os.curdir not in path:
-                path.insert(0, os.curdir)
-
-            # PATHEXT is necessary to check on Windows.
-            pathext = os.environ.get("PATHEXT", "").split(os.pathsep)
-            # See if the given file matches any of the expected path extensions.
-            # This will allow us to short circuit when given "python.exe".
-            # If it does match, only test that one, otherwise we have to try
-            # others.
-            if any(cmd.lower().endswith(ext.lower()) for ext in pathext):
-                files = [cmd]
-            else:
-                files = [cmd + ext for ext in pathext]
-        else:
-            # On other platforms you don't have things like PATHEXT to tell you
-            # what file suffixes are executable, so just pass on cmd as-is.
-            files = [cmd]
-
-        seen = set()
-        for dir in path:
-            normdir = os.path.normcase(dir)
-            if normdir not in seen:
-                seen.add(normdir)
-                for thefile in files:
-                    name = os.path.join(dir, thefile)
-                    if _access_check(name, mode):
-                        return name
-        return None
-
-
 PERFORMANCE_ROOT = os.path.realpath(os.path.dirname(__file__))
 
 
