summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2022-08-15 19:49:21 -0400
committerJason R. Coombs <jaraco@jaraco.com>2022-08-15 20:36:48 -0400
commitc78d7b10f23bb6088d16eb49e445d00bcf5165ca (patch)
tree65cda361bbd6dbf8eaed23ace2a46ab649305ebd
parente6b911708e900f57c98e3b5b03af6de2953dbc76 (diff)
downloadpython-setuptools-git-bugfix/3525-error.tar.gz
Remove code reliant on bdist_wininst. Ref #3525.bugfix/3525-error
-rw-r--r--changelog.d/3525.change.rst1
-rw-r--r--setuptools/command/install_scripts.py9
2 files changed, 1 insertions, 9 deletions
diff --git a/changelog.d/3525.change.rst b/changelog.d/3525.change.rst
new file mode 100644
index 00000000..67b50e00
--- /dev/null
+++ b/changelog.d/3525.change.rst
@@ -0,0 +1 @@
+Removed code referencing bdist_wininst in install_scripts.
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
index aeb0e424..9d2f39c8 100644
--- a/setuptools/command/install_scripts.py
+++ b/setuptools/command/install_scripts.py
@@ -1,6 +1,5 @@
from distutils import log
import distutils.command.install_scripts as orig
-from distutils.errors import DistutilsModuleError
import os
import sys
@@ -34,15 +33,7 @@ class install_scripts(orig.install_scripts):
)
bs_cmd = self.get_finalized_command('build_scripts')
exec_param = getattr(bs_cmd, 'executable', None)
- try:
- bw_cmd = self.get_finalized_command("bdist_wininst")
- is_wininst = getattr(bw_cmd, '_is_running', False)
- except (ImportError, DistutilsModuleError):
- is_wininst = False
writer = ei.ScriptWriter
- if is_wininst:
- exec_param = "python.exe"
- writer = ei.WindowsScriptWriter
if exec_param == sys.executable:
# In case the path to the Python executable contains a space, wrap
# it so it's not split up.