aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/sandbox.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-05-16 08:17:22 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-05-16 08:17:22 -0400
commitac16aa2d54815d3e805c60a38afa5f4c9f3d282f (patch)
tree9d75350af17dd49207c8cae248bf329072a60270 /setuptools/sandbox.py
parenta0d19667eaa92bd95f2bebfcb50a68d0921282eb (diff)
downloadexternal_python_setuptools-ac16aa2d54815d3e805c60a38afa5f4c9f3d282f.tar.gz
external_python_setuptools-ac16aa2d54815d3e805c60a38afa5f4c9f3d282f.tar.bz2
external_python_setuptools-ac16aa2d54815d3e805c60a38afa5f4c9f3d282f.zip
Remove redundant exception for os.devnull
--HG-- branch : Setuptools-Distribute merge
Diffstat (limited to 'setuptools/sandbox.py')
-rwxr-xr-xsetuptools/sandbox.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index e026ff13..f3095125 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -61,7 +61,7 @@ def run_setup(setup_script, args):
sys.argv[:] = [setup_script]+list(args)
sys.path.insert(0, setup_dir)
# reset to include setup dir, w/clean callback list
- working_set.__init__()
+ working_set.__init__()
working_set.callbacks.append(lambda dist:dist.activate())
DirectorySandbox(setup_dir).run(
lambda: execfile(
@@ -241,7 +241,6 @@ class DirectorySandbox(AbstractSandbox):
self._violation("tmpnam")
def _ok(self,path):
- if hasattr(_os,'devnull') and path==_os.devnull: return True
active = self._active
try:
self._active = False