From ac16aa2d54815d3e805c60a38afa5f4c9f3d282f Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 16 May 2013 08:17:22 -0400 Subject: Remove redundant exception for os.devnull --HG-- branch : Setuptools-Distribute merge --- setuptools/sandbox.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'setuptools/sandbox.py') 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 -- cgit v1.2.1