Issue #26261: Merge NamedTemporaryFile docs from 3.5

This commit is contained in:
Martin Panter 2016-02-22 10:10:55 +00:00
commit fe93283fe1
2 changed files with 4 additions and 3 deletions

View File

@ -74,7 +74,8 @@ The module defines the following user-callable items:
This function operates exactly as :func:`TemporaryFile` does, except that This function operates exactly as :func:`TemporaryFile` does, except that
the file is guaranteed to have a visible name in the file system (on the file is guaranteed to have a visible name in the file system (on
Unix, the directory entry is not unlinked). That name can be retrieved Unix, the directory entry is not unlinked). That name can be retrieved
from the :attr:`name` attribute of the file object. Whether the name can be from the :attr:`name` attribute of the returned
file-like object. Whether the name can be
used to open the file a second time, while the named temporary file is used to open the file a second time, while the named temporary file is
still open, varies across platforms (it can be so used on Unix; it cannot still open, varies across platforms (it can be so used on Unix; it cannot
on Windows NT or later). If *delete* is true (the default), the file is on Windows NT or later). If *delete* is true (the default), the file is

View File

@ -533,8 +533,8 @@ def NamedTemporaryFile(mode='w+b', buffering=-1, encoding=None,
The file is created as mkstemp() would do it. The file is created as mkstemp() would do it.
Returns an object with a file-like interface; the name of the file Returns an object with a file-like interface; the name of the file
is accessible as file.name. The file will be automatically deleted is accessible as its 'name' attribute. The file will be automatically
when it is closed unless the 'delete' argument is set to False. deleted when it is closed unless the 'delete' argument is set to False.
""" """
prefix, suffix, dir, output_type = _sanitize_params(prefix, suffix, dir) prefix, suffix, dir, output_type = _sanitize_params(prefix, suffix, dir)