[Python-checkins] cpython (merge 3.2 -> default): #15796: merge with 3.2.
ezio.melotti
python-checkins at python.org
Tue Sep 18 06:21:55 CEST 2012
http://hg.python.org/cpython/rev/3a880d640981
changeset: 79045:3a880d640981
parent: 79042:c6892ce7e56f
parent: 79044:6386e1f4f1fd
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Tue Sep 18 07:21:18 2012 +0300
summary:
#15796: merge with 3.2.
files:
Modules/_io/_iomodule.c | 2 +-
Modules/_io/iobase.c | 2 +-
Modules/_io/textio.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -185,7 +185,7 @@
"\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
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -442,7 +442,7 @@
"\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
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -648,7 +648,7 @@
"\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"
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list