Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

A few small changes: 

* The only exception we should catch when trying to import cStringIO is an
  ImportError.
* Delete the function signatures embedded in the mk*temp docstrings.
* The tempdir global variable was initialized twice.
This commit is contained in:
Skip Montanaro 2008-04-27 22:49:56 +00:00
parent 83101909cb
commit ea59a84244
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/tempfile.py
View File

@ -39,7 +39,7 @@ if _os.name == 'mac':
try: try:
from cStringIO import StringIO as _StringIO from cStringIO import StringIO as _StringIO
except: except ImportError:
from StringIO import StringIO as _StringIO from StringIO import StringIO as _StringIO
try: try:
@ -82,8 +82,6 @@ else:
template = "tmp" template = "tmp"
tempdir = None
# Internal routines. # Internal routines.
_once_lock = _allocate_lock() _once_lock = _allocate_lock()
@ -259,7 +257,7 @@ def gettempprefix():
tempdir = None tempdir = None
def gettempdir(): def gettempdir():
"""Accessor for tempdir.tempdir.""" """Accessor for tempfile.tempdir."""
global tempdir global tempdir
if tempdir is None: if tempdir is None:
_once_lock.acquire() _once_lock.acquire()
@ -271,8 +269,7 @@ def gettempdir():
return tempdir return tempdir
def mkstemp(suffix="", prefix=template, dir=None, text=False): def mkstemp(suffix="", prefix=template, dir=None, text=False):
"""mkstemp([suffix, [prefix, [dir, [text]]]]) """User-callable function to create and return a unique temporary
User-callable function to create and return a unique temporary
file. The return value is a pair (fd, name) where fd is the file. The return value is a pair (fd, name) where fd is the
file descriptor returned by os.open, and name is the filename. file descriptor returned by os.open, and name is the filename.
@ -309,8 +306,7 @@ def mkstemp(suffix="", prefix=template, dir=None, text=False):
def mkdtemp(suffix="", prefix=template, dir=None): def mkdtemp(suffix="", prefix=template, dir=None):
"""mkdtemp([suffix, [prefix, [dir]]]) """User-callable function to create and return a unique temporary
User-callable function to create and return a unique temporary
directory. The return value is the pathname of the directory. directory. The return value is the pathname of the directory.
Arguments are as for mkstemp, except that the 'text' argument is Arguments are as for mkstemp, except that the 'text' argument is
@ -341,8 +337,7 @@ def mkdtemp(suffix="", prefix=template, dir=None):
raise IOError, (_errno.EEXIST, "No usable temporary directory name found") raise IOError, (_errno.EEXIST, "No usable temporary directory name found")
def mktemp(suffix="", prefix=template, dir=None): def mktemp(suffix="", prefix=template, dir=None):
"""mktemp([suffix, [prefix, [dir]]]) """User-callable function to return a unique temporary file name. The
User-callable function to return a unique temporary file name. The
file is not created. file is not created.
Arguments are as for mkstemp, except that the 'text' argument is Arguments are as for mkstemp, except that the 'text' argument is