summaryrefslogtreecommitdiff
path: root/setuptools
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-05-16 08:12:14 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-05-16 08:12:14 -0400
commit374af219591806e3f68d0cfb3fb4b5bc954b59c2 (patch)
tree28823ac375ad73d15ef82db4b789c99d25ff0f84 /setuptools
parent0502c9a7af979a0c58fe5ab75a0317eff2c2e488 (diff)
parentcd3b2cd583b086c82d474f918ba151255131f733 (diff)
downloadpython-setuptools-bitbucket-374af219591806e3f68d0cfb3fb4b5bc954b59c2.tar.gz
Merge latest commit for setuptools-0.6
Diffstat (limited to 'setuptools')
-rwxr-xr-xsetuptools/sandbox.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index e026ff13..a9f0d284 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -241,7 +241,7 @@ class DirectorySandbox(AbstractSandbox):
self._violation("tmpnam")
def _ok(self,path):
- if hasattr(_os,'devnull') and path==_os.devnull: return True
+ if hasattr(os,'devnull') and path==os.devnull: return True
active = self._active
try:
self._active = False