[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2

[terry.reedy]

http://hg.python.org/cpython/rev/fb0d61fd1753
changeset:   74334:fb0d61fd1753
parent:      74332:0df85a2ebe4d
parent:      74333:bc043cef94f2
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Wed Jan 11 14:14:14 2012 -0500
summary:
  Merge with 3.2
#11633 Clarify print buffering (will change again if 13761 adds flush param).

files:
  Doc/library/functions.rst |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -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)

-- 
Repository URL: http://hg.python.org/cpython