Kaydet (Commit) f4aaf862 authored tarafından Guido van Rossum's avatar Guido van Rossum

Be more careful about default temp dir

üst 7a623d7e
...@@ -17,16 +17,26 @@ template = None ...@@ -17,16 +17,26 @@ template = None
# Function to calculate the directory to use # Function to calculate the directory to use
def gettempdir(): def gettempdir():
global tempdir global tempdir
if tempdir == None: attempdirs = ['/usr/tmp', '/tmp', os.getcwd(), os.curdir]
try: if os.environ.has_key('TMPDIR'):
tempdir = os.environ['TMPDIR'] attempdirs.insert(0, os.environ['TMPDIR'])
except (KeyError, AttributeError): testfile = gettempprefix() + '-*-writetest-*-'
if os.name == 'posix': for dir in attempdirs:
tempdir = '/usr/tmp' # XXX Why not /tmp? try:
else: filename = os.path.join(dir, testfile)
tempdir = os.getcwd() # XXX Is this OK? fp = open(filename, 'w')
return tempdir fp.write('blat')
fp.close()
os.unlink(filename)
tempdir = dir
break
except IOError:
pass
if tempdir is None:
msg = "Can't find a usable temporary directory amongst " + `attempdirs`
raise IOError, msg
return tempdir
# Function to calculate a prefix of the filename to use # Function to calculate a prefix of the filename to use
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment