diff options
| -rw-r--r-- | CHANGES.txt | 1 | ||||
| -rw-r--r-- | setuptools/tests/test_easy_install.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 4a799497..2e51b44c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,7 @@ CHANGES ------ * Fix 2 errors with Jython 2.5. +* Fix 1 failure with Jython 2.5 and 2.7. ------ 0.6.32 diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index b1799a5a..582219ce 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -13,7 +13,7 @@ import StringIO 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 @@ -51,7 +51,7 @@ if __name__ == '__main__': sys.exit( load_entry_point('spec', 'console_scripts', 'name')() ) -""" % sys.executable +""" % fix_jython_executable(sys.executable, "") SETUP_PY = """\ from setuptools import setup |