diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-31 22:47:27 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-31 22:47:27 (GMT) |
| commit | 905a2ffe3e5445925a669ab433521ddb66cf1043 (patch) | |
| tree | f3a63e9771498b63eebb2797deaede3577695aaf /Modules/_io/stringio.c | |
| parent | 9b661e6ef636bdd71639befc11e7ce71755f6421 (diff) | |
| download | cpython-905a2ffe3e5445925a669ab433521ddb66cf1043.zip cpython-905a2ffe3e5445925a669ab433521ddb66cf1043.tar.gz cpython-905a2ffe3e5445925a669ab433521ddb66cf1043.tar.bz2 | |
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.
........
Diffstat (limited to 'Modules/_io/stringio.c')
| -rw-r--r-- | Modules/_io/stringio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c index c19c4c0..13e3b58 100644 --- a/Modules/_io/stringio.c +++ b/Modules/_io/stringio.c @@ -350,7 +350,7 @@ PyDoc_STRVAR(stringio_truncate_doc, "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 @@ stringio_truncate(stringio *self, PyObject *args) return NULL; self->string_size = size; } - self->pos = size; return PyLong_FromSsize_t(size); } |