aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/sandbox.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-12-29 22:17:26 -0500
committerJason R. Coombs <jaraco@jaraco.com>2014-12-29 22:17:26 -0500
commit1e6095429693886831747050b38bad979eaaf966 (patch)
tree467bcc2e7c3795cd1cac0f5b49c872904c41002d /setuptools/sandbox.py
parent80561b7f0bb7cf8488e342ee853ac9aff107b021 (diff)
downloadexternal_python_setuptools-1e6095429693886831747050b38bad979eaaf966.tar.gz
external_python_setuptools-1e6095429693886831747050b38bad979eaaf966.tar.bz2
external_python_setuptools-1e6095429693886831747050b38bad979eaaf966.zip
Backed out changeset: 40cc1fbecb1c
Restores purging of distutils/setuptools during sandbox operations. Ref #315.
Diffstat (limited to 'setuptools/sandbox.py')
-rwxr-xr-xsetuptools/sandbox.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index e3c18e39..f1b60cc0 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -126,9 +126,7 @@ def setup_context(setup_dir):
temp_dir = os.path.join(setup_dir, 'temp')
with save_pkg_resources_state():
with save_modules():
- # Disabled per
- # https://bitbucket.org/pypa/setuptools/issue/315/setuptools-should-always-use-its-own#comment-14512075
- # hide_setuptools()
+ hide_setuptools()
with save_path():
with save_argv():
with override_temp(temp_dir):