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
commitb017ca8cba868235e1fc092adae00cb496e04515 (patch)
tree74d38f6439cabc264c80405fc84678567d28a5cd /setuptools
parent585abe8ae6bfdb75f12181629e029b37a7cf3ea6 (diff)
parent7ad02bac8fa7250a96bad6c864e82792e6427273 (diff)
downloadpython-setuptools-git-b017ca8cba868235e1fc092adae00cb496e04515.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