diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-07-25 05:04:50 +0200 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-07-25 05:04:50 +0200 |
| commit | 003e322c69081a0656ec8f810516db3f7b27b7bf (patch) | |
| tree | db518089ab653ea7cad1fd2a8a589c211c8752e9 | |
| parent | 4d29279eaba660ef0ed9ae99e0ea2851bdd6ce2c (diff) | |
| parent | 0ce916addda6adaddc4c6a861e2771adf7ebd3b1 (diff) | |
| download | cpython-003e322c69081a0656ec8f810516db3f7b27b7bf.tar.gz | |
#16937: merge with 3.3.
| -rw-r--r-- | Doc/using/cmdline.rst | 4 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/python.man | 3 | ||||
| -rw-r--r-- | Modules/main.c | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index fa01ea1e13..f628165882 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -274,8 +274,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. @@ -921,6 +921,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 8155e6a447..bcb3ec8723 100644 --- 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 e592d8bd2f..435bd1bfcb 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -73,7 +73,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\ |