#16937: document that stdin is always buffered, even when -u is used. Patch by Elena...

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index e0c80f6bcb96ad388debbe1b395120bd5a3cff2f..f2d261675a038aff5b702330ee3c7d9ae5dc86eb 100644 (file)
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -269,8 +269,8 @@ Miscellaneous options
 
 .. cmdoption:: -u
 
-   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
+   Force the binary layer of the stdout and stderr streams (which is
+   available as their ``buffer`` attribute) to be unbuffered. The text I/O
    layer will still be line-buffered if writing to the console, or
    block-buffered if redirected to a non-interactive file.
 

diff --git a/Misc/ACKS b/Misc/ACKS
index c85b43781837ce0e65d05c7b7b408c5ab4ffda1f..288f18613bb2484e3a1e3cc182e371343fbb7087 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -896,6 +896,7 @@ Tim O'Malley
 Zooko O'Whielacronx
 Aaron Oakley
 James Oakley
+Elena Oat
 Jon Oberheide
 Pascal Oberndoerfer
 Jeffrey Ollie

diff --git a/Misc/python.man b/Misc/python.man
index 8155e6a4472177abeaccc769b8e75aeddb528ed2..bcb3ec87233b63e3cce8f4f7b1ff481f6803f97d 100644 (file)
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -172,7 +172,8 @@ that it entails.  Also disable these manipulations if
 is explicitly imported later.
 .TP
 .B \-u
-Force the binary I/O layers of stdin, stdout and stderr to be unbuffered.
+Force the binary I/O layers of stdout and stderr to be unbuffered.
+stdin is always buffered.
 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

diff --git a/Modules/main.c b/Modules/main.c
index 4d2e03ad9ecbcf7cc5b5bb3255e8c65a489bb9a7..3cfc9c3bd4ec82616747caa5562e683b5c2ba80a 100644 (file)
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -77,7 +77,8 @@ static char *usage_2 = "\
 -S     : don't imply 'import site' on initialization\n\
 ";
 static char *usage_3 = "\
--u     : unbuffered binary stdout and stderr; also PYTHONUNBUFFERED=x\n\
+-u     : unbuffered binary stdout and stderr, stdin always buffered;\n\
+         also PYTHONUNBUFFERED=x\n\
          see man page for details on internal buffering relating to '-u'\n\
 -v     : verbose (trace import statements); also PYTHONVERBOSE=x\n\
          can be supplied multiple times to increase verbosity\n\