Index: Lib/tempfile.py =================================================================== --- Lib/tempfile.py (revisione 86275) +++ Lib/tempfile.py (copia locale) @@ -256,7 +256,7 @@ _once_lock.release() return tempdir -def mkstemp(suffix="", prefix=template, dir=None, text=False): +def mkstemp(suffix="", prefix=None, dir=None, text=False): """User-callable function to create and return a unique temporary file. The return value is a pair (fd, name) where fd is the file descriptor returned by os.open, and name is the filename. @@ -284,6 +284,8 @@ if dir is None: dir = gettempdir() + if prefix is None: + prefix = gettempprefix() if text: flags = _text_openflags @@ -293,7 +295,7 @@ return _mkstemp_inner(dir, prefix, suffix, flags) -def mkdtemp(suffix="", prefix=template, dir=None): +def mkdtemp(suffix="", prefix=None, dir=None): """User-callable function to create and return a unique temporary directory. The return value is the pathname of the directory. @@ -308,6 +310,8 @@ if dir is None: dir = gettempdir() + if prefix is None: + prefix = gettempprefix() names = _get_candidate_names() @@ -324,7 +328,7 @@ raise IOError, (_errno.EEXIST, "No usable temporary directory name found") -def mktemp(suffix="", prefix=template, dir=None): +def mktemp(suffix="", prefix=None, dir=None): """User-callable function to return a unique temporary file name. The file is not created. @@ -343,6 +347,8 @@ if dir is None: dir = gettempdir() + if prefix is None: + prefix = gettempprefix() names = _get_candidate_names() for seq in xrange(TMP_MAX): @@ -417,7 +423,7 @@ def NamedTemporaryFile(mode='w+b', bufsize=-1, suffix="", - prefix=template, dir=None, delete=True): + prefix=None, dir=None, delete=True): """Create and return a temporary file. Arguments: 'prefix', 'suffix', 'dir' -- as for mkstemp. @@ -433,6 +439,8 @@ if dir is None: dir = gettempdir() + if prefix is None: + prefix = gettempprefix() if 'b' in mode: flags = _bin_openflags @@ -455,7 +463,7 @@ else: def TemporaryFile(mode='w+b', bufsize=-1, suffix="", - prefix=template, dir=None): + prefix=None, dir=None): """Create and return a temporary file. Arguments: 'prefix', 'suffix', 'dir' -- as for mkstemp. @@ -469,6 +477,8 @@ if dir is None: dir = gettempdir() + if prefix is None: + prefix = gettempprefix() if 'b' in mode: flags = _bin_openflags @@ -491,10 +501,12 @@ _rolled = False def __init__(self, max_size=0, mode='w+b', bufsize=-1, - suffix="", prefix=template, dir=None): + suffix="", prefix=None, dir=None): self._file = _StringIO() self._max_size = max_size self._rolled = False + if prefix is None: + prefix = gettempprefix() self._TemporaryFileArgs = (mode, bufsize, suffix, prefix, dir) def _check(self, file):