PERF: remove isdir() check in copy_file(), about 10% of the run time was checking if the file to copy is a directory.

.readthedocs.yaml

@@ -3,7 +3,7 @@ python:
   install:
   - path: .
     extra_requirements:
-      - docs
+      - doc
 
 # required boilerplate readthedocs/readthedocs.org#10401
 build:

conftest.py

@@ -56,7 +56,7 @@ def _save_cwd():
 
 @pytest.fixture
 def distutils_managed_tempdir(request):
-    from distutils.tests import py38compat as os_helper
+    from distutils.tests.compat import py38 as os_helper
 
     self = request.instance
     self.tempdirs = []

distutils/_modified.py

@@ -4,8 +4,8 @@
 import os.path
 
 from ._functools import splat
+from .compat.py39 import zip_strict
 from .errors import DistutilsFileError
-from .py39compat import zip_strict
 
 
 def _newer(source, target):

distutils/command/bdist_rpm.py

@@ -316,11 +316,13 @@ def run(self):  # noqa: C901
 
         source = sdist.get_archive_files()[0]
         source_dir = rpm_dir['SOURCES']
-        self.copy_file(source, source_dir)
+        dest = os.path.join(source_dir, os.path.basename(source))
+        self.copy_file(source, dest)
 
         if self.icon:
             if os.path.exists(self.icon):
-                self.copy_file(self.icon, source_dir)
+                dest = os.path.join(source_dir, os.path.basename(self.icon))
+                self.copy_file(self.icon, dest)
             else:
                 raise DistutilsFileError("icon file '%s' does not exist" % self.icon)
 

distutils/command/install_data.py

@@ -54,7 +54,8 @@ def run(self):
                         "setup script did not provide a directory for "
                         f"'{f}' -- installing right in '{self.install_dir}'"
                     )
-                (out, _) = self.copy_file(f, self.install_dir)
+                dst = os.path.join(self.install_dir, os.path.basename(f))
+                (out, _) = self.copy_file(f, dst)
                 self.outfiles.append(out)
             else:
                 # it's a tuple with path to install to and a list of files
@@ -74,7 +75,8 @@ def run(self):
                     # Copy files, adding them to the list of output files.
                     for data in f[1]:
                         data = convert_path(data)
-                        (out, _) = self.copy_file(data, dir)
+                        dst = os.path.join(dir, os.path.basename(data))
+                        (out, _) = self.copy_file(data, dst)
                         self.outfiles.append(out)
 
     def get_inputs(self):

distutils/command/install_headers.py

@@ -3,6 +3,8 @@
 Implements the Distutils 'install_headers' command, to install C/C++ header
 files to the Python include directory."""
 
+import os
+
 from ..core import Command
 
 
@@ -34,7 +36,8 @@ def run(self):
 
         self.mkpath(self.install_dir)
         for header in headers:
-            (out, _) = self.copy_file(header, self.install_dir)
+            dst = os.path.join(self.install_dir, os.path.basename(header))
+            (out, _) = self.copy_file(header, dst)
             self.outfiles.append(out)
 
     def get_inputs(self):

distutils/compat/__init__.py

@@ -3,11 +3,11 @@
 from .py38 import removeprefix
 
 
-def consolidate_linker_args(args: list[str]) -> str:
+def consolidate_linker_args(args: list[str]) -> list[str] | str:
     """
     Ensure the return value is a string for backward compatibility.
 
-    Retain until at least 2024-04-31. See pypa/distutils#246
+    Retain until at least 2025-04-31. See pypa/distutils#246
     """
 
     if not all(arg.startswith('-Wl,') for arg in args):

distutils/compat/py38.py

@@ -21,3 +21,13 @@ def removesuffix(self, suffix):
 
     def removeprefix(self, prefix):
         return self.removeprefix(prefix)
+
+
+def aix_platform(osname, version, release):
+    try:
+        import _aix_support  # type: ignore
+
+        return _aix_support.aix_platform()
+    except ImportError:
+        pass
+    return f"{osname}-{version}.{release}"

distutils/file_util.py

@@ -70,9 +70,8 @@ def copy_file(  # noqa: C901
     verbose=1,
     dry_run=0,
 ):
-    """Copy a file 'src' to 'dst'.  If 'dst' is a directory, then 'src' is
-    copied there with the same name; otherwise, it must be a filename.  (If
-    the file exists, it will be ruthlessly clobbered.)  If 'preserve_mode'
+    """Copy a file 'src' to 'dst'.
+    (If the file exists, it will be ruthlessly clobbered.)  If 'preserve_mode'
     is true (the default), the file's mode (type and permission bits, or
     whatever is analogous on the current platform) is copied.  If
     'preserve_times' is true (the default), the last-modified and
@@ -109,12 +108,6 @@ def copy_file(  # noqa: C901
             "can't copy '%s': doesn't exist or not a regular file" % src
         )
 
-    if os.path.isdir(dst):
-        dir = dst
-        dst = os.path.join(dst, os.path.basename(src))
-    else:
-        dir = os.path.dirname(dst)
-
     if update and not newer(src, dst):
         if verbose >= 1:
             log.debug("not copying %s (output up-to-date)", src)
@@ -126,10 +119,7 @@ def copy_file(  # noqa: C901
         raise ValueError("invalid value '%s' for 'link' argument" % link)
 
     if verbose >= 1:
-        if os.path.basename(dst) == os.path.basename(src):
-            log.info("%s %s -> %s", action, src, dir)
-        else:
-            log.info("%s %s -> %s", action, src, dst)
+        log.info("%s %s -> %s", action, src, dst)
 
     if dry_run:
         return (dst, 1)

distutils/spawn.py

@@ -6,16 +6,42 @@
 executable name.
 """
 
+from __future__ import annotations
+
 import os
+import platform
 import subprocess
 import sys
+from typing import Mapping
 
 from ._log import log
 from .debug import DEBUG
 from .errors import DistutilsExecError
 
 
-def spawn(cmd, search_path=1, verbose=0, dry_run=0, env=None):  # noqa: C901
+def _debug(cmd):
+    """
+    Render a subprocess command differently depending on DEBUG.
+    """
+    return cmd if DEBUG else cmd[0]
+
+
+def _inject_macos_ver(env: Mapping[str:str] | None) -> Mapping[str:str] | None:
+    if platform.system() != 'Darwin':
+        return env
+
+    from distutils.util import MACOSX_VERSION_VAR, get_macosx_target_ver
+
+    target_ver = get_macosx_target_ver()
+    update = {MACOSX_VERSION_VAR: target_ver} if target_ver else {}
+    return {**_resolve(env), **update}
+
+
+def _resolve(env: Mapping[str:str] | None) -> Mapping[str:str]:
+    return os.environ if env is None else env
+
+
+def spawn(cmd, search_path=True, verbose=False, dry_run=False, env=None):
     """Run another program, specified as a command list 'cmd', in a new process.
 
     'cmd' is just the argument list for the new process, ie.
@@ -31,10 +57,6 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0, env=None):  # noqa: C901
     Raise DistutilsExecError if running the program fails in any way; just
     return on success.
     """
-    # cmd is documented as a list, but just in case some code passes a tuple
-    # in, protect our %-formatting code against horrible death
-    cmd = list(cmd)
-
     log.info(subprocess.list2cmdline(cmd))
     if dry_run:
         return
@@ -44,28 +66,16 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0, env=None):  # noqa: C901
         if executable is not None:
             cmd[0] = executable
 
-    env = env if env is not None else dict(os.environ)
-
-    if sys.platform == 'darwin':
-        from distutils.util import MACOSX_VERSION_VAR, get_macosx_target_ver
-
-        macosx_target_ver = get_macosx_target_ver()
-        if macosx_target_ver:
-            env[MACOSX_VERSION_VAR] = macosx_target_ver
-
     try:
-        proc = subprocess.Popen(cmd, env=env)
-        proc.wait()
-        exitcode = proc.returncode
+        subprocess.check_call(cmd, env=_inject_macos_ver(env))
     except OSError as exc:
-        if not DEBUG:
-            cmd = cmd[0]
-        raise DistutilsExecError(f"command {cmd!r} failed: {exc.args[-1]}") from exc
-
-    if exitcode:
-        if not DEBUG:
-            cmd = cmd[0]
-        raise DistutilsExecError(f"command {cmd!r} failed with exit code {exitcode}")
+        raise DistutilsExecError(
+            f"command {_debug(cmd)!r} failed: {exc.args[-1]}"
+        ) from exc
+    except subprocess.CalledProcessError as err:
+        raise DistutilsExecError(
+            f"command {_debug(cmd)!r} failed with exit code {err.returncode}"
+        ) from err
 
 
 def find_executable(executable, path=None):
@@ -83,14 +93,13 @@ def find_executable(executable, path=None):
 
     if path is None:
         path = os.environ.get('PATH', None)
+        # bpo-35755: Don't fall through if PATH is the empty string
         if path is None:
             try:
                 path = os.confstr("CS_PATH")
             except (AttributeError, ValueError):
                 # os.confstr() or CS_PATH is not available
                 path = os.defpath
-        # bpo-35755: Don't use os.defpath if the PATH environment variable is
-        # set to an empty string
 
     # PATH='' doesn't match, whereas PATH=':' looks in the current directory
     if not path:

distutils/sysconfig.py

@@ -16,8 +16,8 @@
 import sys
 import sysconfig
 
-from . import py39compat
 from ._functools import pass_none
+from .compat import py39
 from .errors import DistutilsPlatformError
 
 IS_PYPY = '__pypy__' in sys.builtin_module_names
@@ -538,7 +538,7 @@ def get_config_vars(*args):
     global _config_vars
     if _config_vars is None:
         _config_vars = sysconfig.get_config_vars().copy()
-        py39compat.add_ext_suffix(_config_vars)
+        py39.add_ext_suffix(_config_vars)
 
     return [_config_vars.get(name) for name in args] if args else _config_vars
 

distutils/tests/test_archive_util.py

@@ -23,7 +23,7 @@
 import path
 import pytest
 
-from .py38compat import check_warnings
+from .compat.py38 import check_warnings
 from .unix_compat import UID_0_SUPPORT, grp, pwd, require_uid_0, require_unix_id
 
 

distutils/tests/test_bdist_rpm.py

@@ -9,7 +9,7 @@
 
 import pytest
 
-from .py38compat import requires_zlib
+from .compat.py38 import requires_zlib
 
 SETUP_PY = """\
 from distutils.core import setup

distutils/tests/test_build_ext.py

@@ -31,7 +31,7 @@
 import path
 import pytest
 
-from . import py38compat as import_helper
+from .compat import py38 as import_helper
 
 
 @pytest.fixture()

distutils/tests/test_dir_util.py

@@ -73,9 +73,10 @@ def test_copy_tree_verbosity(self, caplog):
 
         mkpath(self.target, verbose=0)
         a_file = path.Path(self.target) / 'ok.txt'
+        to_file = path.Path(self.target2) / 'ok.txt'
         jaraco.path.build({'ok.txt': 'some content'}, self.target)
 
-        wanted = [f'copying {a_file} -> {self.target2}']
+        wanted = [f'copying {a_file} -> {to_file}']
         copy_tree(self.target, self.target2, verbose=1)
         assert caplog.messages == wanted
 

distutils/tests/test_extension.py

@@ -6,7 +6,7 @@
 
 import pytest
 
-from .py38compat import check_warnings
+from .compat.py38 import check_warnings
 
 
 class TestExtension:

distutils/tests/test_filelist.py

@@ -10,7 +10,7 @@
 import jaraco.path
 import pytest
 
-from . import py38compat as os_helper
+from .compat import py38 as os_helper
 
 MANIFEST_IN = """\
 include ok

distutils/tests/test_sdist.py

@@ -20,7 +20,7 @@
 import pytest
 from more_itertools import ilen
 
-from .py38compat import check_warnings
+from .compat.py38 import check_warnings
 from .unix_compat import grp, pwd, require_uid_0, require_unix_id
 
 SETUP_PY = """

distutils/tests/test_spawn.py

@@ -12,7 +12,7 @@
 import path
 import pytest
 
-from . import py38compat as os_helper
+from .compat import py38 as os_helper
 
 
 class TestSpawn(support.TempdirManager):
@@ -45,14 +45,9 @@ def test_spawn(self):
         spawn([exe])  # should work without any error
 
     def test_find_executable(self, tmp_path):
-        program_noeext = 'program'
-        # Give the temporary program an ".exe" suffix for all.
-        # It's needed on Windows and not harmful on other platforms.
-        program = program_noeext + ".exe"
-
-        program_path = tmp_path / program
-        program_path.write_text("", encoding='utf-8')
-        program_path.chmod(stat.S_IXUSR)
+        program_path = self._make_executable(tmp_path, '.exe')
+        program = program_path.name
+        program_noeext = program_path.with_suffix('').name
         filename = str(program_path)
         tmp_dir = path.Path(tmp_path)
 
@@ -121,6 +116,15 @@ def test_find_executable(self, tmp_path):
                 rv = find_executable(program)
                 assert rv == filename
 
+    @staticmethod
+    def _make_executable(tmp_path, ext):
+        # Give the temporary program a suffix regardless of platform.
+        # It's needed on Windows and not harmful on others.
+        program = tmp_path.joinpath('program').with_suffix(ext)
+        program.write_text("", encoding='utf-8')
+        program.chmod(stat.S_IXUSR)
+        return program
+
     def test_spawn_missing_exe(self):
         with pytest.raises(DistutilsExecError) as ctx:
             spawn(['does-not-exist'])