Arfrever Frehtes Taifersar Arahesis avatar Arfrever Frehtes Taifersar Arahesis committed 41d492f

Fix 1 failure with Jython 2.5 and 2.7.
(Now there remain 0 failures and 2 errors with Jython 2.5 and 0 failures and 5 errors with Jython 2.7.)

Comments (0)

Files changed (2)

 ------
 
 * Fix 2 errors with Jython 2.5.
+* Fix 1 failure with Jython 2.5 and 2.7.
 
 ------
 0.6.32

setuptools/tests/test_easy_install.py

 import distutils.core
 
 from setuptools.sandbox import run_setup, SandboxViolation
-from setuptools.command.easy_install import easy_install, get_script_args, main
+from setuptools.command.easy_install import easy_install, fix_jython_executable, get_script_args, main
 from setuptools.command.easy_install import  PthDistributions
 from setuptools.command import easy_install as easy_install_pkg
 from setuptools.dist import Distribution
     sys.exit(
         load_entry_point('spec', 'console_scripts', 'name')()
     )
-""" % sys.executable
+""" % fix_jython_executable(sys.executable, "")
 
 SETUP_PY = """\
 from setuptools import setup
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.