aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/sandbox.py
diff options
context:
space:
mode:
authorErik Bray <embray@stsci.edu>2012-09-06 15:51:09 -0400
committerErik Bray <embray@stsci.edu>2012-09-06 15:51:09 -0400
commitd847dbfeee2b2c85d7bc0a66813c33836a9850fa (patch)
treecf4b50b5a36018e59664e0a3b0ab6866db53c461 /setuptools/sandbox.py
parent9ebbe014df37c19976a5a9cb0ac2fa228a03144a (diff)
downloadexternal_python_setuptools-d847dbfeee2b2c85d7bc0a66813c33836a9850fa.tar.gz
external_python_setuptools-d847dbfeee2b2c85d7bc0a66813c33836a9850fa.tar.bz2
external_python_setuptools-d847dbfeee2b2c85d7bc0a66813c33836a9850fa.zip
Adds a fix for issue #318, including a regression test. This also fixes another test that was passing trivially due to *bug* in yet another test, ugh
--HG-- branch : distribute extra : rebase_source : 476550766b7b756dced040ad4356b7685d6f062a
Diffstat (limited to 'setuptools/sandbox.py')
-rwxr-xr-xsetuptools/sandbox.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index ab2543d9..64f725e7 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -166,12 +166,12 @@ else:
_EXCEPTIONS = []
try:
- from win32com.client.gencache import GetGeneratePath
- _EXCEPTIONS.append(GetGeneratePath())
- del GetGeneratePath
+ from win32com.client.gencache import GetGeneratePath
+ _EXCEPTIONS.append(GetGeneratePath())
+ del GetGeneratePath
except ImportError:
- # it appears pywin32 is not installed, so no need to exclude.
- pass
+ # it appears pywin32 is not installed, so no need to exclude.
+ pass
class DirectorySandbox(AbstractSandbox):
"""Restrict operations to a single subdirectory - pseudo-chroot"""