aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/easy_install.py
diff options
context:
space:
mode:
authoragronholm <none@none>2009-10-20 01:37:01 +0300
committeragronholm <none@none>2009-10-20 01:37:01 +0300
commite6e0e5add9321df50c5da9ee2f1650740024c8ed (patch)
tree43b3edb487a977df31cc2236469960ed277ee60d /setuptools/command/easy_install.py
parent748696a763c3b57aff3b4f39c4461c5a6b7ef4ee (diff)
downloadexternal_python_setuptools-e6e0e5add9321df50c5da9ee2f1650740024c8ed.tar.gz
external_python_setuptools-e6e0e5add9321df50c5da9ee2f1650740024c8ed.tar.bz2
external_python_setuptools-e6e0e5add9321df50c5da9ee2f1650740024c8ed.zip
Reversing patch for 64-bit Windows script launcher, applied PJE's simpler solution instead
--HG-- branch : distribute extra : rebase_source : 320927dbc962a262853cae7d8b3734794bb9f21d
Diffstat (limited to 'setuptools/command/easy_install.py')
-rwxr-xr-xsetuptools/command/easy_install.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 4b03e185..195139c7 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1603,14 +1603,13 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
")\n"
) % locals()
if sys.platform=='win32' or wininst:
- word_size = [32, 64]['amd64' in sys.version.lower()]
# On Windows/wininst, add a .py extension and an .exe launcher
if group=='gui_scripts':
- ext, launcher = '-script.pyw', 'gui-%d.exe' % word_size
+ ext, launcher = '-script.pyw', 'gui.exe'
old = ['.pyw']
new_header = re.sub('(?i)python.exe','pythonw.exe',header)
else:
- ext, launcher = '-script.py', 'cli-%d.exe' % word_size
+ ext, launcher = '-script.py', 'cli.exe'
old = ['.py','.pyc','.pyo']
new_header = re.sub('(?i)pythonw.exe','python.exe',header)