diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-01-20 21:05:41 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-01-20 21:05:41 -0500 |
| commit | 0a81b14fbfdf9b41bf128c99da42a374dff6122a (patch) | |
| tree | 9e06e27d211dc3cb059a357dc1ad44b5a9f1a7a5 /setuptools | |
| parent | adbb4edde04b071e4b092b675bb0c2ffb66a0977 (diff) | |
| download | external_python_setuptools-0a81b14fbfdf9b41bf128c99da42a374dff6122a.tar.gz external_python_setuptools-0a81b14fbfdf9b41bf128c99da42a374dff6122a.tar.bz2 external_python_setuptools-0a81b14fbfdf9b41bf128c99da42a374dff6122a.zip | |
Replace use of fix_jython_executable with CommandSpec invocation.
Diffstat (limited to 'setuptools')
| -rw-r--r-- | setuptools/tests/test_easy_install.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index a2f26e08..3be829c5 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -26,7 +26,7 @@ from setuptools.compat import StringIO, BytesIO, urlparse from setuptools.sandbox import run_setup import setuptools.command.easy_install as ei from setuptools.command.easy_install import ( - easy_install, fix_jython_executable, nt_quote_arg, + easy_install, nt_quote_arg, is_sh, ScriptWriter, CommandSpec, ) from setuptools.command.easy_install import PthDistributions @@ -51,8 +51,7 @@ class FakeDist(object): def as_requirement(self): return 'spec' -WANTED = DALS(""" - #!%s +WANTED = ei.CommandSpec.best().from_environment().as_header() + DALS(""" # EASY-INSTALL-ENTRY-SCRIPT: 'spec','console_scripts','name' __requires__ = 'spec' import sys @@ -62,7 +61,7 @@ WANTED = DALS(""" sys.exit( load_entry_point('spec', 'console_scripts', 'name')() ) - """) % nt_quote_arg(fix_jython_executable(sys.executable, "")) + """) SETUP_PY = DALS(""" from setuptools import setup |