traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Merge 3.2) open() / TextIOWrapper doc: make it explicit than newline='\n' 

doesn't translate newlines on output.
This commit is contained in:
Victor Stinner 2012-08-04 01:22:07 +02:00
parent 3c25dfbf13 401e17d0f0
commit d1f9352bd4
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/library/functions.rst
View File

@ -887,9 +887,9 @@ are always available. They are listed here in alphabetical order.
* On output, if *newline* is ``None``, any ``'\n'`` characters written are * On output, if *newline* is ``None``, any ``'\n'`` characters written are
translated to the system default line separator, :data:`os.linesep`. If translated to the system default line separator, :data:`os.linesep`. If
*newline* is ``''``, no translation takes place. If *newline* is any of *newline* is ``''`` or ``'\n'``, no translation takes place. If *newline*
the other legal values, any ``'\n'`` characters written are translated to is any of the other legal values, any ``'\n'`` characters written are
the given string. translated to the given string.
If *closefd* is ``False`` and a file descriptor rather than a filename was If *closefd* is ``False`` and a file descriptor rather than a filename was
given, the underlying file descriptor will be kept open when the file is given, the underlying file descriptor will be kept open when the file is

6
Doc/library/io.rst
View File

@ -780,9 +780,9 @@ Text I/O
* On output, if *newline* is ``None``, any ``'\n'`` characters written are * On output, if *newline* is ``None``, any ``'\n'`` characters written are
translated to the system default line separator, :data:`os.linesep`. If translated to the system default line separator, :data:`os.linesep`. If
*newline* is ``''``, no translation takes place. If *newline* is any of *newline* is ``''`` or ``'\n'``, no translation takes place. If *newline*
the other legal values, any ``'\n'`` characters written are translated to is any of the other legal values, any ``'\n'`` characters written are
the given string. translated to the given string.
If *line_buffering* is ``True``, :meth:`flush` is implied when a call to If *line_buffering* is ``True``, :meth:`flush` is implied when a call to
write contains a newline character. write contains a newline character.

6
Modules/_io/_iomodule.c
View File

@ -185,9 +185,9 @@ 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 '', no translation takes place. If newline is any of the\n" " newline is '' or '\n', no translation takes place. If newline is any\n"
" other legal values, any '\\n' characters written are translated to\n" " of the other legal values, any '\\n' characters written are translated\n"
" the given string.\n" " to the given string.\n"
"\n" "\n"
"If closefd is False, the underlying file descriptor will be kept open\n" "If closefd is False, the underlying file descriptor will be kept open\n"
"when the file is closed. This does not work when a file name is given\n" "when the file is closed. This does not work when a file name is given\n"

6
Modules/_io/textio.c
View File

@ -648,9 +648,9 @@ 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 '', no translation takes place. If newline is any of the\n" " newline is '' or '\n', no translation takes place. If newline is any\n"
" other legal values, any '\\n' characters written are translated to\n" " of the other legal values, any '\\n' characters written are translated\n"
" the given string.\n" " to the given string.\n"
"\n" "\n"
"If line_buffering is True, a call to flush is implied when a call to\n" "If line_buffering is True, a call to flush is implied when a call to\n"
"write contains a newline character." "write contains a newline character."