Commit 07265306 authored by Jason R. Coombs's avatar Jason R. Coombs

Restore setuptools.command.easy_install.sys_executable for pbr compatibility.

parent cda3ccf5
...@@ -2,6 +2,14 @@ ...@@ -2,6 +2,14 @@
CHANGES 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 12.0
---- ----
......
...@@ -56,7 +56,6 @@ from pkg_resources import ( ...@@ -56,7 +56,6 @@ from pkg_resources import (
) )
import pkg_resources import pkg_resources
# Turn on PEP440Warnings # Turn on PEP440Warnings
warnings.filterwarnings("default", category=pkg_resources.PEP440Warning) warnings.filterwarnings("default", category=pkg_resources.PEP440Warning)
...@@ -1917,6 +1916,9 @@ class CommandSpec(list): ...@@ -1917,6 +1916,9 @@ class CommandSpec(list):
cmdline = subprocess.list2cmdline(items) cmdline = subprocess.list2cmdline(items)
return '#!' + cmdline + '\n' return '#!' + cmdline + '\n'
# For pbr compat; will be removed in a future version.
sys_executable = CommandSpec._sys_executable()
class JythonCommandSpec(CommandSpec): class JythonCommandSpec(CommandSpec):
@classmethod @classmethod
...@@ -2238,4 +2240,3 @@ def _patch_usage(): ...@@ -2238,4 +2240,3 @@ def _patch_usage():
yield yield
finally: finally:
distutils.core.gen_usage = saved distutils.core.gen_usage = saved
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