diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2002-07-28 10:34:08 (GMT) |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2002-07-28 10:34:08 (GMT) |
commit | 611a7101ca2161903f403e3b70e6087957730b1c (patch) | |
tree | 6fb33b9791268c087876146942f45118f472ac31 | |
parent | 75d2d94e0f049162c6ef353a89c5703eb78eaaf6 (diff) | |
download | cpython-611a7101ca2161903f403e3b70e6087957730b1c.zip cpython-611a7101ca2161903f403e3b70e6087957730b1c.tar.gz cpython-611a7101ca2161903f403e3b70e6087957730b1c.tar.bz2 |
Patch #552812: Better description in "python -h" for -u.
-rw-r--r-- | Misc/python.man | 6 | ||||
-rw-r--r-- | Modules/main.c | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Misc/python.man b/Misc/python.man index 5cd8816..2aa1de8 100644 --- a/Misc/python.man +++ b/Misc/python.man @@ -138,7 +138,11 @@ indentation in a way that makes it depend on the worth of a tab expressed in spaces. Issue an error when the option is given twice. .TP .B \-u -Force stdin, stdout and stderr to be totally unbuffered. +Force stdin, stdout and stderr to be totally unbuffered. Note that +there is internal buffering in xreadlines(), 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 diff --git a/Modules/main.c b/Modules/main.c index 9ce8bef..71b5464 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -62,6 +62,7 @@ static char *usage_2 = "\ -S : don't imply 'import site' on initialization\n\ -t : issue warnings about inconsistent tab usage (-tt: issue errors)\n\ -u : unbuffered binary stdout and stderr (also PYTHONUNBUFFERED=x)\n\ + see man page for details on internal buffering relating to "-u"\n\ "; static char *usage_3 = "\ -v : verbose (trace import statements) (also PYTHONVERBOSE=x)\n\ |