From 92ef5aa92dac1ed02829284d05268d120107417f Mon Sep 17 00:00:00 2001 From: torzdf Date: Wed, 21 May 2025 17:57:00 +0100 Subject: [PATCH] bugfix: setup.py fix badly escaped delimiters for Windows --- setup.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 56c0188a..f0109dce 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ import re import sys import typing as T from shutil import which -from subprocess import list2cmdline, PIPE, Popen, run, STDOUT +from subprocess import PIPE, Popen, run, STDOUT from pkg_resources import parse_requirements @@ -1076,7 +1076,9 @@ class Install(): # pylint:disable=too-few-public-methods str The formatted full package and version string """ - return f"{package}{','.join(''.join(spec) for spec in version)}" + retval = f"{package}{','.join(''.join(spec) for spec in version)}" + logger.debug("Formatted package \"%s\" version \"%s\" to \"%s'", package, version, retval) + return retval def _install_setup_packages(self) -> None: """ Install any packages that are required for the setup.py installer to work. This @@ -1495,7 +1497,7 @@ class WinPTYInstaller(Installer): # pylint:disable=too-few-public-methods is_gui: bool) -> None: super().__init__(environment, package, command, is_gui) self._cmd = which(command[0], path=os.environ.get('PATH', os.defpath)) - self._cmdline = list2cmdline(command) + self._cmdline = " ".join(command) logger.debug("cmd: '%s', cmdline: '%s'", self._cmd, self._cmdline) self._pbar = re.compile(r"(?:eta\s[\d\W]+)|(?:\s+\|\s+\d+%)\Z")