changeset:   74334:fb0d61fd1753
parent:      74332:0df85a2ebe4d
parent:      74333:bc043cef94f2
user:        Terry Jan Reedy <tjreedy@udel.edu>
date:        Wed Jan 11 14:14:14 2012 -0500
files:       Doc/library/functions.rst
description:
Merge with 3.2
#11633 Clarify print buffering (will change again if 13761 adds flush param).


diff -r 0df85a2ebe4d -r fb0d61fd1753 Doc/library/functions.rst
--- a/Doc/library/functions.rst	Wed Jan 11 03:32:43 2012 -0500
+++ b/Doc/library/functions.rst	Wed Jan 11 14:14:14 2012 -0500
@@ -959,7 +959,9 @@
    *end*.
 
    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.
+   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.
 
 
 .. function:: property(fget=None, fset=None, fdel=None, doc=None)