#15796: merge with 3.2.

This commit is contained in:
Ezio Melotti 2012-09-18 07:21:18 +03:00
commit 6d10b4d591
3 changed files with 3 additions and 3 deletions

View file

@ -185,7 +185,7 @@ PyDoc_STRVAR(open_doc,
"\n" "\n"
"* On output, if newline is None, any '\\n' characters written are\n" "* On output, if newline is None, any '\\n' characters written are\n"
" translated to the system default line separator, os.linesep. If\n" " translated to the system default line separator, os.linesep. If\n"
" newline is '' or '\n', no translation takes place. If newline is any\n" " newline is '' or '\\n', no translation takes place. If newline is any\n"
" of the other legal values, any '\\n' characters written are translated\n" " of the other legal values, any '\\n' characters written are translated\n"
" to the given string.\n" " to the given string.\n"
"\n" "\n"

View file

@ -442,7 +442,7 @@ PyDoc_STRVAR(iobase_readline_doc,
"\n" "\n"
"If limit is specified, at most limit bytes will be read.\n" "If limit is specified, at most limit bytes will be read.\n"
"\n" "\n"
"The line terminator is always b'\n' for binary files; for text\n" "The line terminator is always b'\\n' for binary files; for text\n"
"files, the newlines argument to open can be used to select the line\n" "files, the newlines argument to open can be used to select the line\n"
"terminator(s) recognized.\n"); "terminator(s) recognized.\n");

View file

@ -648,7 +648,7 @@ PyDoc_STRVAR(textiowrapper_doc,
"\n" "\n"
"* On output, if newline is None, any '\\n' characters written are\n" "* On output, if newline is None, any '\\n' characters written are\n"
" translated to the system default line separator, os.linesep. If\n" " translated to the system default line separator, os.linesep. If\n"
" newline is '' or '\n', no translation takes place. If newline is any\n" " newline is '' or '\\n', no translation takes place. If newline is any\n"
" of the other legal values, any '\\n' characters written are translated\n" " of the other legal values, any '\\n' characters written are translated\n"
" to the given string.\n" " to the given string.\n"
"\n" "\n"