diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-07-25 03:04:50 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-07-25 03:04:50 (GMT) |
| commit | 3e1e97a99af5edf1a916d93c8c610f35953c9495 (patch) | |
| tree | 837da328072bf6a4c43280c195d8ce8ddd00451e | |
| parent | 6f08d30afe7703e8f016b879cb66e697000bc239 (diff) | |
| parent | 61b0c672b5e9ba1cf564947ecb38d175fd70ea7e (diff) | |
| download | cpython-3e1e97a99af5edf1a916d93c8c610f35953c9495.zip cpython-3e1e97a99af5edf1a916d93c8c610f35953c9495.tar.gz cpython-3e1e97a99af5edf1a916d93c8c610f35953c9495.tar.bz2 | |
#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 fa01ea1..f628165 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 8155e6a..bcb3ec8 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 e592d8b..435bd1b 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\ |