diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-16 08:18:02 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-16 08:18:02 -0400 |
| commit | c421f1214c90f20710be0a5c4605d10da3bdc896 (patch) | |
| tree | 1694bbd10b4fe0950604515aad333787589fbcc9 | |
| parent | b017ca8cba868235e1fc092adae00cb496e04515 (diff) | |
| parent | ac16aa2d54815d3e805c60a38afa5f4c9f3d282f (diff) | |
| download | python-setuptools-git-c421f1214c90f20710be0a5c4605d10da3bdc896.tar.gz | |
Merge with updated merge branch
| -rwxr-xr-x | setuptools/sandbox.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py index a9f0d284..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 |