diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2010-05-15 07:33:37 -1000 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2010-05-15 07:33:37 -1000 |
commit | 1fc291ffa0bdddb8869224a760f3af7ef5a45cf5 (patch) | |
tree | ca6c6b1e70f74b169bd6167d5c2aa81fbddb693d /setuptools/sandbox.py | |
parent | 4353f3f6eaabc04859bcbd592c58df985bd2ad3b (diff) | |
parent | de6e3bcc3c77bff17a6609b31bc1b6a9212bbd88 (diff) | |
download | external_python_setuptools-1fc291ffa0bdddb8869224a760f3af7ef5a45cf5.tar.gz external_python_setuptools-1fc291ffa0bdddb8869224a760f3af7ef5a45cf5.tar.bz2 external_python_setuptools-1fc291ffa0bdddb8869224a760f3af7ef5a45cf5.zip |
Merged Fix for #151
--HG--
branch : distribute
extra : rebase_source : 7f7f9c64a26c6110096387b9862e06455c49f2ec
Diffstat (limited to 'setuptools/sandbox.py')
-rwxr-xr-x | setuptools/sandbox.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py index b2ae991f..37fc60af 100755 --- a/setuptools/sandbox.py +++ b/setuptools/sandbox.py @@ -152,7 +152,10 @@ class AbstractSandbox: ) -_EXCEPTIONS = [os.devnull,] +if hasattr(os, 'devnull'): + _EXCEPTIONS = [os.devnull,] +else: + _EXCEPTIONS = [] try: win32com_pkg = os.path.dirname(__import__('win32com').__file__) @@ -209,7 +212,7 @@ class DirectorySandbox(AbstractSandbox): def _exempted(self, filepath): exception_matches = map(filepath.startswith, self._exceptions) - return any(exception_matches) + return True in exception_matches def _remap_input(self,operation,path,*args,**kw): """Called for path inputs""" |