From: Georg Brandl <georg@python.org>
Date: Fri, 2 Apr 2010 08:47:07 +0000 (+0000)
Subject: #8213: document behavior of -u on py3k better.
X-Git-Tag: v3.2a1~1281
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=379299cecc7d6a7aaa5601ff42d9083329e33ab6;p=thirdparty%2FPython%2Fcpython.git

#8213: document behavior of -u on py3k better.
---

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 540e4d7b0f92..0978770e1a4d 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -232,8 +232,9 @@ Miscellaneous options
 
 .. cmdoption:: -u
 
-   Force stdin, stdout and stderr to be totally unbuffered.  On systems where it
-   matters, also put stdin, stdout and stderr in binary mode.
+   Force the binary layer of the stdin, stdout and stderr streams (which is
+   available as their ``buffer`` attribute) to be unbuffered.  The text I/O
+   layer will still be line-buffered.
 
    See also :envvar:`PYTHONUNBUFFERED`.
 
diff --git a/Misc/python.man b/Misc/python.man
index 9a406a8e95a4..b96c8608b14f 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -165,12 +165,12 @@ and the site-dependent manipulations of
 that it entails.
 .TP
 .B \-u
-Force stdin, stdout and stderr to be totally unbuffered.  On systems
-where it matters, also put stdin, stdout and stderr in binary mode.
-Note that there is internal buffering in readlines() and
-file-object iterators ("for line in sys.stdin") which is not
-influenced by this option.  To work around this, you will want to use
-"sys.stdin.readline()" inside a "while 1:" loop.
+Force the binary I/O layers of stdin, stdout and stderr to be unbuffered.
+The text I/O layer will still be line-buffered.
+.\" Note that there is internal buffering in readlines() and
+.\" file-object iterators ("for line in sys.stdin") which is not
+.\" influenced by this option.  To work around this, you will want to use
+.\" "sys.stdin.readline()" inside a "while 1:" loop.
 .TP
 .B \-v
 Print a message each time a module is initialized, showing the place