merge heads

This commit is contained in:
Benjamin Peterson 2012-01-12 15:26:20 -05:00
commit 1adbc6f56a
1 changed files with 2 additions and 2 deletions

View File

@ -960,8 +960,8 @@ are always available. They are listed here in alphabetical order.
The *file* argument must be an object with a ``write(string)`` method; if it
is not present or ``None``, :data:`sys.stdout` will be used. Output buffering
is determined by *file*. Use ``sys.stdout.flush()`` to ensure immediate
appearance on a screen.
is determined by *file*. Use ``file.flush()`` to ensure, for instance,
immediate appearance on a screen.
.. function:: property(fget=None, fset=None, fdel=None, doc=None)