Changeset 391 for python/trunk/Doc/library/tempfile.rst

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Doc/library/tempfile.rst (modified) (5 diffs)

python/trunk/Doc/library/tempfile.rst

@@ -1 @@
-
 :mod:`tempfile` --- Generate temporary files and directories
 ============================================================
@@ -13 +12 @@
    pair: temporary; file name
    pair: temporary; file
+
+**Source code:** :source:`Lib/tempfile.py`
+
+--------------
 
 This module generates temporary files and directories.  It works on all
@@ -62 +65 @@
    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
-   from the :attr:`name` member of the file object.  Whether the name can be
+   from the :attr:`name` attribute of the file object.  Whether the name can be
    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
@@ -84 +87 @@
    until the file's :func:`fileno` method is called, at which point the
    contents are written to disk and operation proceeds as with
-   :func:`TemporaryFile`.
+   :func:`TemporaryFile`.  Also, it's ``truncate`` method does not
+   accept a ``size`` argument.
 
    The resulting file has one additional method, :func:`rollover`, which
@@ -90 +94 @@
 
    The returned object is a file-like object whose :attr:`_file` attribute
-   is either a :class:`StringIO` object or a true file object, depending on
+   is either a :class:`~StringIO.StringIO` object or a true file object, depending on
    whether :func:`rollover` has been called. This file-like object can be
    used in a :keyword:`with` statement, just like a normal file.