diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-09-18 04:21:18 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-09-18 04:21:18 (GMT) |
| commit | 6d10b4d591a91132e65850ab8d6f56d6e21a5356 (patch) | |
| tree | 64a53bd749c98e77d7cd9aeb98601c7a6e32dfde | |
| parent | 4a5fae1b794846faa02bbdd7c67272db290d2e66 (diff) | |
| parent | 16d2b478372ba68923f8e325c75202416aaeaa93 (diff) | |
| download | cpython-6d10b4d591a91132e65850ab8d6f56d6e21a5356.zip cpython-6d10b4d591a91132e65850ab8d6f56d6e21a5356.tar.gz cpython-6d10b4d591a91132e65850ab8d6f56d6e21a5356.tar.bz2 | |
#15796: merge with 3.2.
| -rw-r--r-- | Modules/_io/_iomodule.c | 2 | ||||
| -rw-r--r-- | Modules/_io/iobase.c | 2 | ||||
| -rw-r--r-- | Modules/_io/textio.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index 0622c58..d3a87e7 100644 --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -185,7 +185,7 @@ PyDoc_STRVAR(open_doc, "\n" "* On output, if newline is None, any '\\n' characters written are\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" " to the given string.\n" "\n" diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c index dd052ae..babb019 100644 --- a/Modules/_io/iobase.c +++ b/Modules/_io/iobase.c @@ -442,7 +442,7 @@ PyDoc_STRVAR(iobase_readline_doc, "\n" "If limit is specified, at most limit bytes will be read.\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" "terminator(s) recognized.\n"); diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index fb9b674..96434a8 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -648,7 +648,7 @@ PyDoc_STRVAR(textiowrapper_doc, "\n" "* On output, if newline is None, any '\\n' characters written are\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" " to the given string.\n" "\n" |