summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2012-08-03 23:22:07 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2012-08-03 23:22:07 (GMT)
commitd1f9352bd4b30ccfe665109b1341433a00dc6256 (patch)
treeb8aa8be72c756344cf35ce37ff0b90c2ea12b4cb /Doc
parent3c25dfbf13279c90cf35e5b4424f1c94483306d3 (diff)
parent401e17d0f06dd6594835424c5544689abdc0cc9f (diff)
downloadcpython-d1f9352bd4b30ccfe665109b1341433a00dc6256.zip
cpython-d1f9352bd4b30ccfe665109b1341433a00dc6256.tar.gz
cpython-d1f9352bd4b30ccfe665109b1341433a00dc6256.tar.bz2
(Merge 3.2) open() / TextIOWrapper doc: make it explicit than newline='\n'
doesn't translate newlines on output.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/functions.rst6
-rw-r--r--Doc/library/io.rst6
2 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 0bb22aa..3f56621 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -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
translated to the system default line separator, :data:`os.linesep`. If
- *newline* is ``''``, no translation takes place. If *newline* is any of
- the other legal values, any ``'\n'`` characters written are translated to
- the given string.
+ *newline* is ``''`` or ``'\n'``, no translation takes place. If *newline*
+ is any of the other legal values, any ``'\n'`` characters written are
+ translated to the given string.
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
diff --git a/Doc/library/io.rst b/Doc/library/io.rst
index 0aadc9d..aeaf56b 100644
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -780,9 +780,9 @@ Text I/O
* On output, if *newline* is ``None``, any ``'\n'`` characters written are
translated to the system default line separator, :data:`os.linesep`. If
- *newline* is ``''``, no translation takes place. If *newline* is any of
- the other legal values, any ``'\n'`` characters written are translated to
- the given string.
+ *newline* is ``''`` or ``'\n'``, no translation takes place. If *newline*
+ is any of the other legal values, any ``'\n'`` characters written are
+ translated to the given string.
If *line_buffering* is ``True``, :meth:`flush` is implied when a call to
write contains a newline character.