diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com> | 2012-11-27 00:40:15 +0100 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com> | 2012-11-27 00:40:15 +0100 |
| commit | 753f783100cf598316e9030dcf59b24772819504 (patch) | |
| tree | eb061f0c6e8c7ec96b8935bd9488415fd817d043 | |
| parent | 3b6b1d147dae6ba825d0597d88abfda4cc3d295a (diff) | |
| download | python-setuptools-git-753f783100cf598316e9030dcf59b24772819504.tar.gz | |
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.)
--HG--
branch : distribute
extra : rebase_source : 319071404608c4f34616df74bfeaa28d590edd0c
| -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 |