diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-01-16 17:22:22 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-01-16 17:22:22 -0500 |
| commit | 072653066beade0dc5fde02c26e747002ab80baa (patch) | |
| tree | 865d8b8ea76fe15a2ad306ac9c4afb9111be16ce | |
| parent | cda3ccf5c2b87212ca53b91fb782e2b858686dd3 (diff) | |
| download | external_python_setuptools-072653066beade0dc5fde02c26e747002ab80baa.tar.gz external_python_setuptools-072653066beade0dc5fde02c26e747002ab80baa.tar.bz2 external_python_setuptools-072653066beade0dc5fde02c26e747002ab80baa.zip | |
Restore setuptools.command.easy_install.sys_executable for pbr compatibility.
| -rw-r--r-- | CHANGES.txt | 8 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index ad419d25..d6775876 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,14 @@ CHANGES ======= +------ +12.0.1 +------ + +* Restore ``setuptools.command.easy_install.sys_executable`` for pbr + compatibility. For the future, tools should construct a CommandSpec + explicitly. + ---- 12.0 ---- diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index b61ab034..adb18140 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -56,7 +56,6 @@ from pkg_resources import ( ) import pkg_resources - # Turn on PEP440Warnings warnings.filterwarnings("default", category=pkg_resources.PEP440Warning) @@ -1917,6 +1916,9 @@ class CommandSpec(list): cmdline = subprocess.list2cmdline(items) return '#!' + cmdline + '\n' +# For pbr compat; will be removed in a future version. +sys_executable = CommandSpec._sys_executable() + class JythonCommandSpec(CommandSpec): @classmethod @@ -2238,4 +2240,3 @@ def _patch_usage(): yield finally: distutils.core.gen_usage = saved - |