Skip to content

Commit 90bbf31

Browse files
authored
Merge pull request #3531 from pypa/bugfix/3525-error
Remove code reliant on bdist_wininst
2 parents 7a72d55 + 0e3c5bf commit 90bbf31

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

newsfragments/3525.feature.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Removed code referencing bdist_wininst in install_scripts.

setuptools/command/install_scripts.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from distutils import log
22
import distutils.command.install_scripts as orig
3-
from distutils.errors import DistutilsModuleError
43
import os
54
import sys
65

@@ -37,15 +36,7 @@ def _install_ep_scripts(self):
3736
)
3837
bs_cmd = self.get_finalized_command('build_scripts')
3938
exec_param = getattr(bs_cmd, 'executable', None)
40-
try:
41-
bw_cmd = self.get_finalized_command("bdist_wininst")
42-
is_wininst = getattr(bw_cmd, '_is_running', False)
43-
except (ImportError, DistutilsModuleError):
44-
is_wininst = False
4539
writer = ei.ScriptWriter
46-
if is_wininst:
47-
exec_param = "python.exe"
48-
writer = ei.WindowsScriptWriter
4940
if exec_param == sys.executable:
5041
# In case the path to the Python executable contains a space, wrap
5142
# it so it's not split up.

0 commit comments

Comments
 (0)