[Python-checkins] cpython (merge 3.3 -> default): #16937: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/52f0aa0d552a
changeset:   84812:52f0aa0d552a
parent:      84810:96d817f41c4c
parent:      84811:4b33f74ab0f1
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Jul 25 05:04:50 2013 +0200
summary:
  #16937: merge with 3.3.

files:
  Doc/using/cmdline.rst |  4 ++--
  Misc/ACKS             |  1 +
  Misc/python.man       |  3 ++-
  Modules/main.c        |  3 ++-
  4 files changed, 7 insertions(+), 4 deletions(-)


diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -274,8 +274,8 @@
 
 .. 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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -921,6 +921,7 @@
 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
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -172,7 +172,8 @@
 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
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -73,7 +73,8 @@
 -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\

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