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
parent 3b6b1d14
...@@ -7,6 +7,7 @@ CHANGES ...@@ -7,6 +7,7 @@ CHANGES
------ ------
* Fix 2 errors with Jython 2.5. * Fix 2 errors with Jython 2.5.
* Fix 1 failure with Jython 2.5 and 2.7.
------ ------
0.6.32 0.6.32
......
...@@ -13,7 +13,7 @@ import StringIO ...@@ -13,7 +13,7 @@ import StringIO
import distutils.core import distutils.core
from setuptools.sandbox import run_setup, SandboxViolation 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.easy_install import PthDistributions
from setuptools.command import easy_install as easy_install_pkg from setuptools.command import easy_install as easy_install_pkg
from setuptools.dist import Distribution from setuptools.dist import Distribution
...@@ -51,7 +51,7 @@ if __name__ == '__main__': ...@@ -51,7 +51,7 @@ if __name__ == '__main__':
sys.exit( sys.exit(
load_entry_point('spec', 'console_scripts', 'name')() load_entry_point('spec', 'console_scripts', 'name')()
) )
""" % sys.executable """ % fix_jython_executable(sys.executable, "")
SETUP_PY = """\ SETUP_PY = """\
from setuptools import setup from setuptools import setup
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment