Merged revisions 77895-77896 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r77895 | antoine.pitrou | 2010-01-31 23:47:27 +0100 (dim., 31 janv. 2010) | 12 lines
Merged revisions 77890 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77890 | antoine.pitrou | 2010-01-31 23:26:04 +0100 (dim., 31 janv. 2010) | 7 lines
- Issue #6939: Fix file I/O objects in the `io` module to keep the original
file position when calling `truncate()`. It would previously change the
file position to the given argument, which goes against the tradition of
ftruncate() and other truncation APIs. Patch by Pascal Chambon.
........
................
r77896 | antoine.pitrou | 2010-02-01 00:12:29 +0100 (lun., 01 févr. 2010) | 3 lines
r77895 broke doctest.
................
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c
index bfb099c..e02d26b 100644
--- a/Modules/_io/stringio.c
+++ b/Modules/_io/stringio.c
@@ -350,7 +350,7 @@
"Truncate size to pos.\n"
"\n"
"The pos argument defaults to the current file position, as\n"
- "returned by tell(). Imply an absolute seek to pos.\n"
+ "returned by tell(). The current file position is unchanged.\n"
"Returns the new absolute position.\n");
static PyObject *
@@ -390,7 +390,6 @@
return NULL;
self->string_size = size;
}
- self->pos = size;
return PyLong_FromSsize_t(size);
}