Mailman 3 January 2010 - Python-checkins

r73367 - python/trunk/Doc/library/bisect.rst
by raymond.hettinger 04 Feb '10

04 Feb '10

Author: raymond.hettinger Date: Fri Jun 12 00:04:00 2009 New Revision: 73367 Log: Add example of how to do key lookups with bisect(). Modified: python/trunk/Doc/library/bisect.rst Modified: python/trunk/Doc/library/bisect.rst ============================================================================== --- python/trunk/Doc/library/bisect.rst (original) +++ python/trunk/Doc/library/bisect.rst Fri Jun 12 00:04:00 2009 @@ -85,4 +85,22 @@ >>> map(grade, [33, 99, 77, 44, 12, 88]) ['E', 'A', 'B', 'D', 'F', 'A'] +Unlike the :func:`sorted` function, it does not make sense for the :func:`bisect` +functions to have *key* or *reversed* arguments because that would lead to an +inefficent design (successive calls to bisect functions would not "remember" +all of the previous key lookups). +Instead, it is better to search a list of precomputed keys to find the index +of the record in question:: + + >>> data = [('red', 5), ('blue', 1), ('yellow', 8), ('black', 0)] + >>> data.sort(key=lambda r: r[1]) # precomputed list of keys + >>> keys = [r[1] for r in data] + >>> data[bisect_left(keys, 0)] + ('black', 0) + >>> data[bisect_left(keys, 1)] + ('blue', 1) + >>> data[bisect_left(keys, 5)] + ('red', 5) + >>> data[bisect_left(keys, 8)] + ('yellow', 8)

3 2

r77897 - in python/branches/release31-maint: Lib/_pyio.py Lib/doctest.py Lib/test/test_fileio.py Lib/test/test_io.py Lib/test/test_largefile.py Lib/test/test_memoryio.py Misc/ACKS Misc/NEWS Modules/_io/bytesio.c Modules/_io/fileio.c Modules/_io/iobase.c Modules/_io/stringio.c Modules/_io/textio.c
by antoine.pitrou 31 Jan '10

31 Jan '10

Author: antoine.pitrou Date: Mon Feb 1 00:20:26 2010 New Revision: 77897 Log: 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. ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/_pyio.py python/branches/release31-maint/Lib/doctest.py python/branches/release31-maint/Lib/test/test_fileio.py python/branches/release31-maint/Lib/test/test_io.py python/branches/release31-maint/Lib/test/test_largefile.py python/branches/release31-maint/Lib/test/test_memoryio.py python/branches/release31-maint/Misc/ACKS python/branches/release31-maint/Misc/NEWS python/branches/release31-maint/Modules/_io/bytesio.c python/branches/release31-maint/Modules/_io/fileio.c python/branches/release31-maint/Modules/_io/iobase.c python/branches/release31-maint/Modules/_io/stringio.c python/branches/release31-maint/Modules/_io/textio.c Modified: python/branches/release31-maint/Lib/_pyio.py ============================================================================== --- python/branches/release31-maint/Lib/_pyio.py (original) +++ python/branches/release31-maint/Lib/_pyio.py Mon Feb 1 00:20:26 2010 @@ -851,7 +851,7 @@ elif pos < 0: raise ValueError("negative truncate position %r" % (pos,)) del self._buffer[pos:] - return self.seek(pos) + return pos def readable(self): return True @@ -1210,8 +1210,7 @@ if pos is None: pos = self.tell() # Use seek to flush the read buffer. - self.seek(pos) - return BufferedWriter.truncate(self) + return BufferedWriter.truncate(self, pos) def read(self, n=None): if n is None: @@ -1712,8 +1711,7 @@ self.flush() if pos is None: pos = self.tell() - self.seek(pos) - return self.buffer.truncate() + return self.buffer.truncate(pos) def detach(self): if self.buffer is None: Modified: python/branches/release31-maint/Lib/doctest.py ============================================================================== --- python/branches/release31-maint/Lib/doctest.py (original) +++ python/branches/release31-maint/Lib/doctest.py Mon Feb 1 00:20:26 2010 @@ -247,7 +247,8 @@ return result def truncate(self, size=None): - StringIO.truncate(self, size) + self.seek(size) + StringIO.truncate(self) # Worst-case linear-time ellipsis matching. def _ellipsis_match(want, got): Modified: python/branches/release31-maint/Lib/test/test_fileio.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_fileio.py (original) +++ python/branches/release31-maint/Lib/test/test_fileio.py Mon Feb 1 00:20:26 2010 @@ -330,6 +330,17 @@ f.close() self.fail("no error for invalid mode: %s" % bad_mode) + def testTruncate(self): + f = _FileIO(TESTFN, 'w') + f.write(bytes(bytearray(range(10)))) + self.assertEqual(f.tell(), 10) + f.truncate(5) + self.assertEqual(f.tell(), 10) + self.assertEqual(f.seek(0, os.SEEK_END), 5) + f.truncate(15) + self.assertEqual(f.tell(), 5) + self.assertEqual(f.seek(0, os.SEEK_END), 15) + def testTruncateOnWindows(self): def bug801631(): # SF bug <http://www.python.org/sf/801631> Modified: python/branches/release31-maint/Lib/test/test_io.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_io.py (original) +++ python/branches/release31-maint/Lib/test/test_io.py Mon Feb 1 00:20:26 2010 @@ -229,6 +229,11 @@ def write_ops(self, f): self.assertEqual(f.write(b"blah."), 5) + f.truncate(0) + self.assertEqual(f.tell(), 5) + f.seek(0) + + self.assertEqual(f.write(b"blah."), 5) self.assertEqual(f.seek(0), 0) self.assertEqual(f.write(b"Hello."), 6) self.assertEqual(f.tell(), 6) @@ -239,8 +244,9 @@ self.assertEqual(f.write(b"h"), 1) self.assertEqual(f.seek(-1, 2), 13) self.assertEqual(f.tell(), 13) + self.assertEqual(f.truncate(12), 12) - self.assertEqual(f.tell(), 12) + self.assertEqual(f.tell(), 13) self.assertRaises(TypeError, f.seek, 0.0) def read_ops(self, f, buffered=False): @@ -285,7 +291,7 @@ self.assertEqual(f.tell(), self.LARGE + 2) self.assertEqual(f.seek(0, 2), self.LARGE + 2) self.assertEqual(f.truncate(self.LARGE + 1), self.LARGE + 1) - self.assertEqual(f.tell(), self.LARGE + 1) + self.assertEqual(f.tell(), self.LARGE + 2) self.assertEqual(f.seek(0, 2), self.LARGE + 1) self.assertEqual(f.seek(-1, 2), self.LARGE) self.assertEqual(f.read(2), b"x") @@ -980,7 +986,7 @@ bufio = self.tp(raw, 8) bufio.write(b"abcdef") self.assertEqual(bufio.truncate(3), 3) - self.assertEqual(bufio.tell(), 3) + self.assertEqual(bufio.tell(), 6) with self.open(support.TESTFN, "rb", buffering=0) as f: self.assertEqual(f.read(), b"abc") @@ -1366,6 +1372,14 @@ self.assertEqual(s, b"A" + b"B" * overwrite_size + b"A" * (9 - overwrite_size)) + def test_truncate_after_read_or_write(self): + raw = self.BytesIO(b"A" * 10) + bufio = self.tp(raw, 100) + self.assertEqual(bufio.read(2), b"AA") # the read buffer gets filled + self.assertEqual(bufio.truncate(), 2) + self.assertEqual(bufio.write(b"BB"), 2) # the write buffer increases + self.assertEqual(bufio.truncate(), 4) + def test_misbehaved_io(self): BufferedReaderTest.test_misbehaved_io(self) BufferedWriterTest.test_misbehaved_io(self) Modified: python/branches/release31-maint/Lib/test/test_largefile.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_largefile.py (original) +++ python/branches/release31-maint/Lib/test/test_largefile.py Mon Feb 1 00:20:26 2010 @@ -122,14 +122,14 @@ newsize -= 1 f.seek(42) f.truncate(newsize) - self.assertEqual(f.tell(), newsize) # else wasn't truncated + self.assertEqual(f.tell(), 42) f.seek(0, 2) self.assertEqual(f.tell(), newsize) # XXX truncate(larger than true size) is ill-defined # across platform; cut it waaaaay back f.seek(0) f.truncate(1) - self.assertEqual(f.tell(), 1) # else pointer moved + self.assertEqual(f.tell(), 0) # else pointer moved f.seek(0) self.assertEqual(len(f.read()), 1) # else wasn't truncated Modified: python/branches/release31-maint/Lib/test/test_memoryio.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_memoryio.py (original) +++ python/branches/release31-maint/Lib/test/test_memoryio.py Mon Feb 1 00:20:26 2010 @@ -72,7 +72,7 @@ self.assertEqual(f.seek(0), 0) self.assertEqual(f.write(t("h")), 1) self.assertEqual(f.truncate(12), 12) - self.assertEqual(f.tell(), 12) + self.assertEqual(f.tell(), 1) def test_write(self): buf = self.buftype("hello world\n") @@ -120,7 +120,8 @@ self.assertEqual(memio.getvalue(), buf[:6]) self.assertEqual(memio.truncate(4), 4) self.assertEqual(memio.getvalue(), buf[:4]) - self.assertEqual(memio.tell(), 4) + self.assertEqual(memio.tell(), 6) + memio.seek(0, 2) memio.write(buf) self.assertEqual(memio.getvalue(), buf[:4] + buf) pos = memio.tell() Modified: python/branches/release31-maint/Misc/ACKS ============================================================================== --- python/branches/release31-maint/Misc/ACKS (original) +++ python/branches/release31-maint/Misc/ACKS Mon Feb 1 00:20:26 2010 @@ -118,6 +118,7 @@ Donn Cave Per Cederqvist Octavian Cerna +Pascal Chambon Hye-Shik Chang Jeffrey Chang Mitch Chapman Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Mon Feb 1 00:20:26 2010 @@ -76,6 +76,11 @@ Library ------- +- 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. + - Issue #7792: Registering non-classes to ABCs raised an obscure error. - Issue #7785: Don't accept bytes in FileIO.write(). Modified: python/branches/release31-maint/Modules/_io/bytesio.c ============================================================================== --- python/branches/release31-maint/Modules/_io/bytesio.c (original) +++ python/branches/release31-maint/Modules/_io/bytesio.c Mon Feb 1 00:20:26 2010 @@ -412,7 +412,7 @@ "truncate([size]) -> int. Truncate the file to at most size bytes.\n" "\n" "Size defaults to the current file position, as returned by tell().\n" -"Returns the new size. Imply an absolute seek to the position size."); +"The current file position is unchanged. Returns the new size.\n"); static PyObject * bytesio_truncate(bytesio *self, PyObject *args) @@ -451,7 +451,6 @@ if (resize_buffer(self, size) < 0) return NULL; } - self->pos = size; return PyLong_FromSsize_t(size); } Modified: python/branches/release31-maint/Modules/_io/fileio.c ============================================================================== --- python/branches/release31-maint/Modules/_io/fileio.c (original) +++ python/branches/release31-maint/Modules/_io/fileio.c Mon Feb 1 00:20:26 2010 @@ -761,8 +761,10 @@ static PyObject * fileio_truncate(fileio *self, PyObject *args) { - PyObject *posobj = NULL; + PyObject *posobj = NULL; /* the new size wanted by the user */ +#ifndef MS_WINDOWS Py_off_t pos; +#endif int ret; int fd; @@ -777,58 +779,86 @@ if (posobj == Py_None || posobj == NULL) { /* Get the current position. */ - posobj = portable_lseek(fd, NULL, 1); - if (posobj == NULL) + posobj = portable_lseek(fd, NULL, 1); + if (posobj == NULL) return NULL; - } - else { - /* Move to the position to be truncated. */ - posobj = portable_lseek(fd, posobj, 0); - } - if (posobj == NULL) - return NULL; - -#if defined(HAVE_LARGEFILE_SUPPORT) - pos = PyLong_AsLongLong(posobj); -#else - pos = PyLong_AsLong(posobj); -#endif - if (pos == -1 && PyErr_Occurred()) - return NULL; + } + else { + Py_INCREF(posobj); + } #ifdef MS_WINDOWS /* MS _chsize doesn't work if newsize doesn't fit in 32 bits, so don't even try using it. */ { + PyObject *oldposobj, *tempposobj; HANDLE hFile; + + /* we save the file pointer position */ + oldposobj = portable_lseek(fd, NULL, 1); + if (oldposobj == NULL) { + Py_DECREF(posobj); + return NULL; + } + + /* we then move to the truncation position */ + tempposobj = portable_lseek(fd, posobj, 0); + if (tempposobj == NULL) { + Py_DECREF(oldposobj); + Py_DECREF(posobj); + return NULL; + } + Py_DECREF(tempposobj); /* Truncate. Note that this may grow the file! */ Py_BEGIN_ALLOW_THREADS errno = 0; hFile = (HANDLE)_get_osfhandle(fd); - ret = hFile == (HANDLE)-1; + ret = hFile == (HANDLE)-1; /* testing for INVALID_HANDLE value */ if (ret == 0) { ret = SetEndOfFile(hFile) == 0; if (ret) errno = EACCES; } Py_END_ALLOW_THREADS + + /* we restore the file pointer position in any case */ + tempposobj = portable_lseek(fd, oldposobj, 0); + Py_DECREF(oldposobj); + if (tempposobj == NULL) { + Py_DECREF(posobj); + return NULL; + } + Py_DECREF(tempposobj); } #else + +#if defined(HAVE_LARGEFILE_SUPPORT) + pos = PyLong_AsLongLong(posobj); +#else + pos = PyLong_AsLong(posobj); +#endif + if (PyErr_Occurred()){ + Py_DECREF(posobj); + return NULL; + } + Py_BEGIN_ALLOW_THREADS errno = 0; ret = ftruncate(fd, pos); Py_END_ALLOW_THREADS + #endif /* !MS_WINDOWS */ if (ret != 0) { + Py_DECREF(posobj); PyErr_SetFromErrno(PyExc_IOError); return NULL; } return posobj; } -#endif +#endif /* HAVE_FTRUNCATE */ static char * mode_string(fileio *self) Modified: python/branches/release31-maint/Modules/_io/iobase.c ============================================================================== --- python/branches/release31-maint/Modules/_io/iobase.c (original) +++ python/branches/release31-maint/Modules/_io/iobase.c Mon Feb 1 00:20:26 2010 @@ -102,8 +102,8 @@ PyDoc_STRVAR(iobase_truncate_doc, "Truncate file to size bytes.\n" "\n" - "Size defaults to the current IO position as reported by tell(). Return\n" - "the new size."); + "File pointer is left unchanged. Size defaults to the current IO\n" + "position as reported by tell(). Returns the new size."); static PyObject * iobase_truncate(PyObject *self, PyObject *args) Modified: python/branches/release31-maint/Modules/_io/stringio.c ============================================================================== --- python/branches/release31-maint/Modules/_io/stringio.c (original) +++ python/branches/release31-maint/Modules/_io/stringio.c Mon Feb 1 00:20:26 2010 @@ -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); } Modified: python/branches/release31-maint/Modules/_io/textio.c ============================================================================== --- python/branches/release31-maint/Modules/_io/textio.c (original) +++ python/branches/release31-maint/Modules/_io/textio.c Mon Feb 1 00:20:26 2010 @@ -2318,15 +2318,7 @@ return NULL; Py_DECREF(res); - if (pos != Py_None) { - res = PyObject_CallMethodObjArgs((PyObject *) self, - _PyIO_str_seek, pos, NULL); - if (res == NULL) - return NULL; - Py_DECREF(res); - } - - return PyObject_CallMethodObjArgs(self->buffer, _PyIO_str_truncate, NULL); + return PyObject_CallMethodObjArgs(self->buffer, _PyIO_str_truncate, pos, NULL); } static PyObject *

1 0

r77896 - python/branches/py3k/Lib/doctest.py
by antoine.pitrou 31 Jan '10

31 Jan '10

Author: antoine.pitrou Date: Mon Feb 1 00:12:29 2010 New Revision: 77896 Log: r77895 broke doctest. Modified: python/branches/py3k/Lib/doctest.py Modified: python/branches/py3k/Lib/doctest.py ============================================================================== --- python/branches/py3k/Lib/doctest.py (original) +++ python/branches/py3k/Lib/doctest.py Mon Feb 1 00:12:29 2010 @@ -247,7 +247,8 @@ return result def truncate(self, size=None): - StringIO.truncate(self, size) + self.seek(size) + StringIO.truncate(self) # Worst-case linear-time ellipsis matching. def _ellipsis_match(want, got):

1 0

r77895 - in python/branches/py3k: Lib/_pyio.py Lib/test/test_fileio.py Lib/test/test_io.py Lib/test/test_largefile.py Lib/test/test_memoryio.py Misc/ACKS Misc/NEWS Modules/_io/bytesio.c Modules/_io/fileio.c Modules/_io/iobase.c Modules/_io/stringio.c Modules/_io/textio.c
by antoine.pitrou 31 Jan '10

31 Jan '10

Author: antoine.pitrou Date: Sun Jan 31 23:47:27 2010 New Revision: 77895 Log: 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. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/_pyio.py python/branches/py3k/Lib/test/test_fileio.py python/branches/py3k/Lib/test/test_io.py python/branches/py3k/Lib/test/test_largefile.py python/branches/py3k/Lib/test/test_memoryio.py python/branches/py3k/Misc/ACKS python/branches/py3k/Misc/NEWS python/branches/py3k/Modules/_io/bytesio.c python/branches/py3k/Modules/_io/fileio.c python/branches/py3k/Modules/_io/iobase.c python/branches/py3k/Modules/_io/stringio.c python/branches/py3k/Modules/_io/textio.c Modified: python/branches/py3k/Lib/_pyio.py ============================================================================== --- python/branches/py3k/Lib/_pyio.py (original) +++ python/branches/py3k/Lib/_pyio.py Sun Jan 31 23:47:27 2010 @@ -856,7 +856,7 @@ elif pos < 0: raise ValueError("negative truncate position %r" % (pos,)) del self._buffer[pos:] - return self.seek(pos) + return pos def readable(self): return True @@ -1215,8 +1215,7 @@ if pos is None: pos = self.tell() # Use seek to flush the read buffer. - self.seek(pos) - return BufferedWriter.truncate(self) + return BufferedWriter.truncate(self, pos) def read(self, n=None): if n is None: @@ -1717,8 +1716,7 @@ self.flush() if pos is None: pos = self.tell() - self.seek(pos) - return self.buffer.truncate() + return self.buffer.truncate(pos) def detach(self): if self.buffer is None: Modified: python/branches/py3k/Lib/test/test_fileio.py ============================================================================== --- python/branches/py3k/Lib/test/test_fileio.py (original) +++ python/branches/py3k/Lib/test/test_fileio.py Sun Jan 31 23:47:27 2010 @@ -328,6 +328,17 @@ f.close() self.fail("no error for invalid mode: %s" % bad_mode) + def testTruncate(self): + f = _FileIO(TESTFN, 'w') + f.write(bytes(bytearray(range(10)))) + self.assertEqual(f.tell(), 10) + f.truncate(5) + self.assertEqual(f.tell(), 10) + self.assertEqual(f.seek(0, os.SEEK_END), 5) + f.truncate(15) + self.assertEqual(f.tell(), 5) + self.assertEqual(f.seek(0, os.SEEK_END), 15) + def testTruncateOnWindows(self): def bug801631(): # SF bug <http://www.python.org/sf/801631> Modified: python/branches/py3k/Lib/test/test_io.py ============================================================================== --- python/branches/py3k/Lib/test/test_io.py (original) +++ python/branches/py3k/Lib/test/test_io.py Sun Jan 31 23:47:27 2010 @@ -229,6 +229,11 @@ def write_ops(self, f): self.assertEqual(f.write(b"blah."), 5) + f.truncate(0) + self.assertEqual(f.tell(), 5) + f.seek(0) + + self.assertEqual(f.write(b"blah."), 5) self.assertEqual(f.seek(0), 0) self.assertEqual(f.write(b"Hello."), 6) self.assertEqual(f.tell(), 6) @@ -239,8 +244,9 @@ self.assertEqual(f.write(b"h"), 1) self.assertEqual(f.seek(-1, 2), 13) self.assertEqual(f.tell(), 13) + self.assertEqual(f.truncate(12), 12) - self.assertEqual(f.tell(), 12) + self.assertEqual(f.tell(), 13) self.assertRaises(TypeError, f.seek, 0.0) def read_ops(self, f, buffered=False): @@ -285,7 +291,7 @@ self.assertEqual(f.tell(), self.LARGE + 2) self.assertEqual(f.seek(0, 2), self.LARGE + 2) self.assertEqual(f.truncate(self.LARGE + 1), self.LARGE + 1) - self.assertEqual(f.tell(), self.LARGE + 1) + self.assertEqual(f.tell(), self.LARGE + 2) self.assertEqual(f.seek(0, 2), self.LARGE + 1) self.assertEqual(f.seek(-1, 2), self.LARGE) self.assertEqual(f.read(2), b"x") @@ -980,7 +986,7 @@ bufio = self.tp(raw, 8) bufio.write(b"abcdef") self.assertEqual(bufio.truncate(3), 3) - self.assertEqual(bufio.tell(), 3) + self.assertEqual(bufio.tell(), 6) with self.open(support.TESTFN, "rb", buffering=0) as f: self.assertEqual(f.read(), b"abc") @@ -1366,6 +1372,14 @@ self.assertEqual(s, b"A" + b"B" * overwrite_size + b"A" * (9 - overwrite_size)) + def test_truncate_after_read_or_write(self): + raw = self.BytesIO(b"A" * 10) + bufio = self.tp(raw, 100) + self.assertEqual(bufio.read(2), b"AA") # the read buffer gets filled + self.assertEqual(bufio.truncate(), 2) + self.assertEqual(bufio.write(b"BB"), 2) # the write buffer increases + self.assertEqual(bufio.truncate(), 4) + def test_misbehaved_io(self): BufferedReaderTest.test_misbehaved_io(self) BufferedWriterTest.test_misbehaved_io(self) Modified: python/branches/py3k/Lib/test/test_largefile.py ============================================================================== --- python/branches/py3k/Lib/test/test_largefile.py (original) +++ python/branches/py3k/Lib/test/test_largefile.py Sun Jan 31 23:47:27 2010 @@ -122,14 +122,14 @@ newsize -= 1 f.seek(42) f.truncate(newsize) - self.assertEqual(f.tell(), newsize) # else wasn't truncated + self.assertEqual(f.tell(), 42) f.seek(0, 2) self.assertEqual(f.tell(), newsize) # XXX truncate(larger than true size) is ill-defined # across platform; cut it waaaaay back f.seek(0) f.truncate(1) - self.assertEqual(f.tell(), 1) # else pointer moved + self.assertEqual(f.tell(), 0) # else pointer moved f.seek(0) self.assertEqual(len(f.read()), 1) # else wasn't truncated Modified: python/branches/py3k/Lib/test/test_memoryio.py ============================================================================== --- python/branches/py3k/Lib/test/test_memoryio.py (original) +++ python/branches/py3k/Lib/test/test_memoryio.py Sun Jan 31 23:47:27 2010 @@ -73,7 +73,7 @@ self.assertEqual(f.seek(0), 0) self.assertEqual(f.write(t("h")), 1) self.assertEqual(f.truncate(12), 12) - self.assertEqual(f.tell(), 12) + self.assertEqual(f.tell(), 1) def test_write(self): buf = self.buftype("hello world\n") @@ -121,7 +121,8 @@ self.assertEqual(memio.getvalue(), buf[:6]) self.assertEqual(memio.truncate(4), 4) self.assertEqual(memio.getvalue(), buf[:4]) - self.assertEqual(memio.tell(), 4) + self.assertEqual(memio.tell(), 6) + memio.seek(0, 2) memio.write(buf) self.assertEqual(memio.getvalue(), buf[:4] + buf) pos = memio.tell() Modified: python/branches/py3k/Misc/ACKS ============================================================================== --- python/branches/py3k/Misc/ACKS (original) +++ python/branches/py3k/Misc/ACKS Sun Jan 31 23:47:27 2010 @@ -123,6 +123,7 @@ Charles Cazabon Per Cederqvist Octavian Cerna +Pascal Chambon Hye-Shik Chang Jeffrey Chang Mitch Chapman Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sun Jan 31 23:47:27 2010 @@ -239,6 +239,11 @@ Library ------- +- 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. + - Issue #7610: Reworked implementation of the internal :class:`zipfile.ZipExtFile` class used to represent files stored inside an archive. The new implementation is significantly faster and can Modified: python/branches/py3k/Modules/_io/bytesio.c ============================================================================== --- python/branches/py3k/Modules/_io/bytesio.c (original) +++ python/branches/py3k/Modules/_io/bytesio.c Sun Jan 31 23:47:27 2010 @@ -412,7 +412,7 @@ "truncate([size]) -> int. Truncate the file to at most size bytes.\n" "\n" "Size defaults to the current file position, as returned by tell().\n" -"Returns the new size. Imply an absolute seek to the position size."); +"The current file position is unchanged. Returns the new size.\n"); static PyObject * bytesio_truncate(bytesio *self, PyObject *args) @@ -451,7 +451,6 @@ if (resize_buffer(self, size) < 0) return NULL; } - self->pos = size; return PyLong_FromSsize_t(size); } Modified: python/branches/py3k/Modules/_io/fileio.c ============================================================================== --- python/branches/py3k/Modules/_io/fileio.c (original) +++ python/branches/py3k/Modules/_io/fileio.c Sun Jan 31 23:47:27 2010 @@ -758,8 +758,10 @@ static PyObject * fileio_truncate(fileio *self, PyObject *args) { - PyObject *posobj = NULL; + PyObject *posobj = NULL; /* the new size wanted by the user */ +#ifndef MS_WINDOWS Py_off_t pos; +#endif int ret; int fd; @@ -774,58 +776,86 @@ if (posobj == Py_None || posobj == NULL) { /* Get the current position. */ - posobj = portable_lseek(fd, NULL, 1); - if (posobj == NULL) + posobj = portable_lseek(fd, NULL, 1); + if (posobj == NULL) return NULL; - } - else { - /* Move to the position to be truncated. */ - posobj = portable_lseek(fd, posobj, 0); - } - if (posobj == NULL) - return NULL; - -#if defined(HAVE_LARGEFILE_SUPPORT) - pos = PyLong_AsLongLong(posobj); -#else - pos = PyLong_AsLong(posobj); -#endif - if (pos == -1 && PyErr_Occurred()) - return NULL; + } + else { + Py_INCREF(posobj); + } #ifdef MS_WINDOWS /* MS _chsize doesn't work if newsize doesn't fit in 32 bits, so don't even try using it. */ { + PyObject *oldposobj, *tempposobj; HANDLE hFile; + + /* we save the file pointer position */ + oldposobj = portable_lseek(fd, NULL, 1); + if (oldposobj == NULL) { + Py_DECREF(posobj); + return NULL; + } + + /* we then move to the truncation position */ + tempposobj = portable_lseek(fd, posobj, 0); + if (tempposobj == NULL) { + Py_DECREF(oldposobj); + Py_DECREF(posobj); + return NULL; + } + Py_DECREF(tempposobj); /* Truncate. Note that this may grow the file! */ Py_BEGIN_ALLOW_THREADS errno = 0; hFile = (HANDLE)_get_osfhandle(fd); - ret = hFile == (HANDLE)-1; + ret = hFile == (HANDLE)-1; /* testing for INVALID_HANDLE value */ if (ret == 0) { ret = SetEndOfFile(hFile) == 0; if (ret) errno = EACCES; } Py_END_ALLOW_THREADS + + /* we restore the file pointer position in any case */ + tempposobj = portable_lseek(fd, oldposobj, 0); + Py_DECREF(oldposobj); + if (tempposobj == NULL) { + Py_DECREF(posobj); + return NULL; + } + Py_DECREF(tempposobj); } #else + +#if defined(HAVE_LARGEFILE_SUPPORT) + pos = PyLong_AsLongLong(posobj); +#else + pos = PyLong_AsLong(posobj); +#endif + if (PyErr_Occurred()){ + Py_DECREF(posobj); + return NULL; + } + Py_BEGIN_ALLOW_THREADS errno = 0; ret = ftruncate(fd, pos); Py_END_ALLOW_THREADS + #endif /* !MS_WINDOWS */ if (ret != 0) { + Py_DECREF(posobj); PyErr_SetFromErrno(PyExc_IOError); return NULL; } return posobj; } -#endif +#endif /* HAVE_FTRUNCATE */ static char * mode_string(fileio *self) Modified: python/branches/py3k/Modules/_io/iobase.c ============================================================================== --- python/branches/py3k/Modules/_io/iobase.c (original) +++ python/branches/py3k/Modules/_io/iobase.c Sun Jan 31 23:47:27 2010 @@ -102,8 +102,8 @@ PyDoc_STRVAR(iobase_truncate_doc, "Truncate file to size bytes.\n" "\n" - "Size defaults to the current IO position as reported by tell(). Return\n" - "the new size."); + "File pointer is left unchanged. Size defaults to the current IO\n" + "position as reported by tell(). Returns the new size."); static PyObject * iobase_truncate(PyObject *self, PyObject *args) Modified: python/branches/py3k/Modules/_io/stringio.c ============================================================================== --- python/branches/py3k/Modules/_io/stringio.c (original) +++ python/branches/py3k/Modules/_io/stringio.c Sun Jan 31 23:47:27 2010 @@ -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); } Modified: python/branches/py3k/Modules/_io/textio.c ============================================================================== --- python/branches/py3k/Modules/_io/textio.c (original) +++ python/branches/py3k/Modules/_io/textio.c Sun Jan 31 23:47:27 2010 @@ -2318,15 +2318,7 @@ return NULL; Py_DECREF(res); - if (pos != Py_None) { - res = PyObject_CallMethodObjArgs((PyObject *) self, - _PyIO_str_seek, pos, NULL); - if (res == NULL) - return NULL; - Py_DECREF(res); - } - - return PyObject_CallMethodObjArgs(self->buffer, _PyIO_str_truncate, NULL); + return PyObject_CallMethodObjArgs(self->buffer, _PyIO_str_truncate, pos, NULL); } static PyObject *

1 0

r77894 - python/branches/py3k
by victor.stinner 31 Jan '10

31 Jan '10

Author: victor.stinner Date: Sun Jan 31 23:34:52 2010 New Revision: 77894 Log: Blocked revisions 77892 via svnmerge ........ r77892 | victor.stinner | 2010-01-31 23:32:15 +0100 (dim., 31 janv. 2010) | 4 lines Issue #7819: Check sys.call_tracing() arguments types. py3k was already patched by issue #3661. ........ Modified: python/branches/py3k/ (props changed)

1 0

r77893 - in python/branches/release26-maint: Lib/test/test_sys.py Misc/NEWS Python/sysmodule.c
by victor.stinner 31 Jan '10

31 Jan '10

Author: victor.stinner Date: Sun Jan 31 23:33:22 2010 New Revision: 77893 Log: Merged revisions 77892 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77892 | victor.stinner | 2010-01-31 23:32:15 +0100 (dim., 31 janv. 2010) | 4 lines Issue #7819: Check sys.call_tracing() arguments types. py3k was already patched by issue #3661. ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/test/test_sys.py python/branches/release26-maint/Misc/NEWS python/branches/release26-maint/Python/sysmodule.c Modified: python/branches/release26-maint/Lib/test/test_sys.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_sys.py (original) +++ python/branches/release26-maint/Lib/test/test_sys.py Sun Jan 31 23:33:22 2010 @@ -391,6 +391,10 @@ out = p.stdout.read().strip() self.assertEqual(out, '?') + def test_call_tracing(self): + self.assertEqual(sys.call_tracing(str, (2,)), "2") + self.assertRaises(TypeError, sys.call_tracing, str, 2) + class SizeofTest(unittest.TestCase): Modified: python/branches/release26-maint/Misc/NEWS ============================================================================== --- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Sun Jan 31 23:33:22 2010 @@ -12,6 +12,8 @@ Core and Builtins ----------------- +- Issue #7819: Check sys.call_tracing() arguments types. + - Issue #7788: Fix an interpreter crash produced by deleting a list slice with very large step value. Modified: python/branches/release26-maint/Python/sysmodule.c ============================================================================== --- python/branches/release26-maint/Python/sysmodule.c (original) +++ python/branches/release26-maint/Python/sysmodule.c Sun Jan 31 23:33:22 2010 @@ -802,7 +802,7 @@ sys_call_tracing(PyObject *self, PyObject *args) { PyObject *func, *funcargs; - if (!PyArg_UnpackTuple(args, "call_tracing", 2, 2, &func, &funcargs)) + if (!PyArg_ParseTuple(args, "OO!:call_tracing", &func, &PyTuple_Type, &funcargs)) return NULL; return _PyEval_CallTracing(func, funcargs); }

1 0

r77892 - in python/trunk: Lib/test/test_sys.py Misc/NEWS Python/sysmodule.c
by victor.stinner 31 Jan '10

31 Jan '10

Author: victor.stinner Date: Sun Jan 31 23:32:15 2010 New Revision: 77892 Log: Issue #7819: Check sys.call_tracing() arguments types. py3k was already patched by issue #3661. Modified: python/trunk/Lib/test/test_sys.py python/trunk/Misc/NEWS python/trunk/Python/sysmodule.c Modified: python/trunk/Lib/test/test_sys.py ============================================================================== --- python/trunk/Lib/test/test_sys.py (original) +++ python/trunk/Lib/test/test_sys.py Sun Jan 31 23:32:15 2010 @@ -433,6 +433,10 @@ out = p.communicate()[0].strip() self.assertEqual(out, '?') + def test_call_tracing(self): + self.assertEqual(sys.call_tracing(str, (2,)), "2") + self.assertRaises(TypeError, sys.call_tracing, str, 2) + class SizeofTest(unittest.TestCase): Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sun Jan 31 23:32:15 2010 @@ -12,6 +12,8 @@ Core and Builtins ----------------- +- Issue #7819: Check sys.call_tracing() arguments types. + - Issue #7788: Fix an interpreter crash produced by deleting a list slice with very large step value. Modified: python/trunk/Python/sysmodule.c ============================================================================== --- python/trunk/Python/sysmodule.c (original) +++ python/trunk/Python/sysmodule.c Sun Jan 31 23:32:15 2010 @@ -840,7 +840,7 @@ sys_call_tracing(PyObject *self, PyObject *args) { PyObject *func, *funcargs; - if (!PyArg_UnpackTuple(args, "call_tracing", 2, 2, &func, &funcargs)) + if (!PyArg_ParseTuple(args, "OO!:call_tracing", &func, &PyTuple_Type, &funcargs)) return NULL; return _PyEval_CallTracing(func, funcargs); }

1 0

r77891 - python/branches/release26-maint
by antoine.pitrou 31 Jan '10

31 Jan '10

Author: antoine.pitrou Date: Sun Jan 31 23:26:41 2010 New Revision: 77891 Log: Note: the issue was fixed in an earlier commit. Blocked revisions 77890 via svnmerge ........ 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. ........ Modified: python/branches/release26-maint/ (props changed)

1 0

r77890 - in python/trunk: Lib/_pyio.py Lib/test/test_fileio.py Lib/test/test_io.py Lib/test/test_largefile.py Lib/test/test_memoryio.py Misc/ACKS Misc/NEWS Modules/_io/bytesio.c Modules/_io/fileio.c Modules/_io/iobase.c Modules/_io/stringio.c Modules/_io/textio.c
by antoine.pitrou 31 Jan '10

31 Jan '10

Author: antoine.pitrou Date: Sun Jan 31 23:26:04 2010 New Revision: 77890 Log: - 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. Modified: python/trunk/Lib/_pyio.py python/trunk/Lib/test/test_fileio.py python/trunk/Lib/test/test_io.py python/trunk/Lib/test/test_largefile.py python/trunk/Lib/test/test_memoryio.py python/trunk/Misc/ACKS python/trunk/Misc/NEWS python/trunk/Modules/_io/bytesio.c python/trunk/Modules/_io/fileio.c python/trunk/Modules/_io/iobase.c python/trunk/Modules/_io/stringio.c python/trunk/Modules/_io/textio.c Modified: python/trunk/Lib/_pyio.py ============================================================================== --- python/trunk/Lib/_pyio.py (original) +++ python/trunk/Lib/_pyio.py Sun Jan 31 23:26:04 2010 @@ -867,7 +867,7 @@ elif pos < 0: raise ValueError("negative truncate position %r" % (pos,)) del self._buffer[pos:] - return self.seek(pos) + return pos def readable(self): return True @@ -1226,8 +1226,7 @@ if pos is None: pos = self.tell() # Use seek to flush the read buffer. - self.seek(pos) - return BufferedWriter.truncate(self) + return BufferedWriter.truncate(self, pos) def read(self, n=None): if n is None: @@ -1727,8 +1726,7 @@ self.flush() if pos is None: pos = self.tell() - self.seek(pos) - return self.buffer.truncate() + return self.buffer.truncate(pos) def detach(self): if self.buffer is None: Modified: python/trunk/Lib/test/test_fileio.py ============================================================================== --- python/trunk/Lib/test/test_fileio.py (original) +++ python/trunk/Lib/test/test_fileio.py Sun Jan 31 23:26:04 2010 @@ -329,6 +329,17 @@ f.close() self.fail("no error for invalid mode: %s" % bad_mode) + def testTruncate(self): + f = _FileIO(TESTFN, 'w') + f.write(bytes(bytearray(range(10)))) + self.assertEqual(f.tell(), 10) + f.truncate(5) + self.assertEqual(f.tell(), 10) + self.assertEqual(f.seek(0, os.SEEK_END), 5) + f.truncate(15) + self.assertEqual(f.tell(), 5) + self.assertEqual(f.seek(0, os.SEEK_END), 15) + def testTruncateOnWindows(self): def bug801631(): # SF bug <http://www.python.org/sf/801631> Modified: python/trunk/Lib/test/test_io.py ============================================================================== --- python/trunk/Lib/test/test_io.py (original) +++ python/trunk/Lib/test/test_io.py Sun Jan 31 23:26:04 2010 @@ -234,6 +234,11 @@ def write_ops(self, f): self.assertEqual(f.write(b"blah."), 5) + f.truncate(0) + self.assertEqual(f.tell(), 5) + f.seek(0) + + self.assertEqual(f.write(b"blah."), 5) self.assertEqual(f.seek(0), 0) self.assertEqual(f.write(b"Hello."), 6) self.assertEqual(f.tell(), 6) @@ -244,8 +249,9 @@ self.assertEqual(f.write(b"h"), 1) self.assertEqual(f.seek(-1, 2), 13) self.assertEqual(f.tell(), 13) + self.assertEqual(f.truncate(12), 12) - self.assertEqual(f.tell(), 12) + self.assertEqual(f.tell(), 13) self.assertRaises(TypeError, f.seek, 0.0) def read_ops(self, f, buffered=False): @@ -290,7 +296,7 @@ self.assertEqual(f.tell(), self.LARGE + 2) self.assertEqual(f.seek(0, 2), self.LARGE + 2) self.assertEqual(f.truncate(self.LARGE + 1), self.LARGE + 1) - self.assertEqual(f.tell(), self.LARGE + 1) + self.assertEqual(f.tell(), self.LARGE + 2) self.assertEqual(f.seek(0, 2), self.LARGE + 1) self.assertEqual(f.seek(-1, 2), self.LARGE) self.assertEqual(f.read(2), b"x") @@ -988,7 +994,7 @@ bufio = self.tp(raw, 8) bufio.write(b"abcdef") self.assertEqual(bufio.truncate(3), 3) - self.assertEqual(bufio.tell(), 3) + self.assertEqual(bufio.tell(), 6) with self.open(support.TESTFN, "rb", buffering=0) as f: self.assertEqual(f.read(), b"abc") @@ -1374,6 +1380,14 @@ self.assertEqual(s, b"A" + b"B" * overwrite_size + b"A" * (9 - overwrite_size)) + def test_truncate_after_read_or_write(self): + raw = self.BytesIO(b"A" * 10) + bufio = self.tp(raw, 100) + self.assertEqual(bufio.read(2), b"AA") # the read buffer gets filled + self.assertEqual(bufio.truncate(), 2) + self.assertEqual(bufio.write(b"BB"), 2) # the write buffer increases + self.assertEqual(bufio.truncate(), 4) + def test_misbehaved_io(self): BufferedReaderTest.test_misbehaved_io(self) BufferedWriterTest.test_misbehaved_io(self) Modified: python/trunk/Lib/test/test_largefile.py ============================================================================== --- python/trunk/Lib/test/test_largefile.py (original) +++ python/trunk/Lib/test/test_largefile.py Sun Jan 31 23:26:04 2010 @@ -125,7 +125,7 @@ f.seek(42) f.truncate(newsize) if self.new_io: - self.assertEqual(f.tell(), newsize) # else wasn't truncated + self.assertEqual(f.tell(), 42) f.seek(0, 2) self.assertEqual(f.tell(), newsize) # XXX truncate(larger than true size) is ill-defined @@ -133,7 +133,7 @@ f.seek(0) f.truncate(1) if self.new_io: - self.assertEqual(f.tell(), 1) # else pointer moved + self.assertEqual(f.tell(), 0) # else pointer moved f.seek(0) self.assertEqual(len(f.read()), 1) # else wasn't truncated Modified: python/trunk/Lib/test/test_memoryio.py ============================================================================== --- python/trunk/Lib/test/test_memoryio.py (original) +++ python/trunk/Lib/test/test_memoryio.py Sun Jan 31 23:26:04 2010 @@ -76,7 +76,7 @@ self.assertEqual(f.seek(0), 0) self.assertEqual(f.write(t("h")), 1) self.assertEqual(f.truncate(12), 12) - self.assertEqual(f.tell(), 12) + self.assertEqual(f.tell(), 1) def test_write(self): buf = self.buftype("hello world\n") @@ -127,7 +127,8 @@ # truncate() accepts long objects self.assertEqual(memio.truncate(4L), 4) self.assertEqual(memio.getvalue(), buf[:4]) - self.assertEqual(memio.tell(), 4) + self.assertEqual(memio.tell(), 6) + memio.seek(0, 2) memio.write(buf) self.assertEqual(memio.getvalue(), buf[:4] + buf) pos = memio.tell() Modified: python/trunk/Misc/ACKS ============================================================================== --- python/trunk/Misc/ACKS (original) +++ python/trunk/Misc/ACKS Sun Jan 31 23:26:04 2010 @@ -124,6 +124,7 @@ Charles Cazabon Per Cederqvist Octavian Cerna +Pascal Chambon Hye-Shik Chang Jeffrey Chang Mitch Chapman Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sun Jan 31 23:26:04 2010 @@ -50,6 +50,11 @@ Library ------- +- 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. + - UserDict is now a new-style class. - Issue #7610: Reworked implementation of the internal Modified: python/trunk/Modules/_io/bytesio.c ============================================================================== --- python/trunk/Modules/_io/bytesio.c (original) +++ python/trunk/Modules/_io/bytesio.c Sun Jan 31 23:26:04 2010 @@ -414,7 +414,7 @@ "truncate([size]) -> int. Truncate the file to at most size bytes.\n" "\n" "Size defaults to the current file position, as returned by tell().\n" -"Returns the new size. Imply an absolute seek to the position size."); +"The current file position is unchanged. Returns the new size.\n"); static PyObject * bytesio_truncate(bytesio *self, PyObject *args) @@ -453,7 +453,6 @@ if (resize_buffer(self, size) < 0) return NULL; } - self->pos = size; return PyLong_FromSsize_t(size); } Modified: python/trunk/Modules/_io/fileio.c ============================================================================== --- python/trunk/Modules/_io/fileio.c (original) +++ python/trunk/Modules/_io/fileio.c Sun Jan 31 23:26:04 2010 @@ -758,8 +758,10 @@ static PyObject * fileio_truncate(fileio *self, PyObject *args) { - PyObject *posobj = NULL; + PyObject *posobj = NULL; /* the new size wanted by the user */ +#ifndef MS_WINDOWS Py_off_t pos; +#endif int ret; int fd; @@ -774,58 +776,86 @@ if (posobj == Py_None || posobj == NULL) { /* Get the current position. */ - posobj = portable_lseek(fd, NULL, 1); - if (posobj == NULL) + posobj = portable_lseek(fd, NULL, 1); + if (posobj == NULL) return NULL; - } - else { - /* Move to the position to be truncated. */ - posobj = portable_lseek(fd, posobj, 0); - } - if (posobj == NULL) - return NULL; - -#if defined(HAVE_LARGEFILE_SUPPORT) - pos = PyLong_AsLongLong(posobj); -#else - pos = PyLong_AsLong(posobj); -#endif - if (pos == -1 && PyErr_Occurred()) - return NULL; + } + else { + Py_INCREF(posobj); + } #ifdef MS_WINDOWS /* MS _chsize doesn't work if newsize doesn't fit in 32 bits, so don't even try using it. */ { + PyObject *oldposobj, *tempposobj; HANDLE hFile; + + /* we save the file pointer position */ + oldposobj = portable_lseek(fd, NULL, 1); + if (oldposobj == NULL) { + Py_DECREF(posobj); + return NULL; + } + + /* we then move to the truncation position */ + tempposobj = portable_lseek(fd, posobj, 0); + if (tempposobj == NULL) { + Py_DECREF(oldposobj); + Py_DECREF(posobj); + return NULL; + } + Py_DECREF(tempposobj); /* Truncate. Note that this may grow the file! */ Py_BEGIN_ALLOW_THREADS errno = 0; hFile = (HANDLE)_get_osfhandle(fd); - ret = hFile == (HANDLE)-1; + ret = hFile == (HANDLE)-1; /* testing for INVALID_HANDLE value */ if (ret == 0) { ret = SetEndOfFile(hFile) == 0; if (ret) errno = EACCES; } Py_END_ALLOW_THREADS + + /* we restore the file pointer position in any case */ + tempposobj = portable_lseek(fd, oldposobj, 0); + Py_DECREF(oldposobj); + if (tempposobj == NULL) { + Py_DECREF(posobj); + return NULL; + } + Py_DECREF(tempposobj); } #else + +#if defined(HAVE_LARGEFILE_SUPPORT) + pos = PyLong_AsLongLong(posobj); +#else + pos = PyLong_AsLong(posobj); +#endif + if (PyErr_Occurred()){ + Py_DECREF(posobj); + return NULL; + } + Py_BEGIN_ALLOW_THREADS errno = 0; ret = ftruncate(fd, pos); Py_END_ALLOW_THREADS + #endif /* !MS_WINDOWS */ if (ret != 0) { + Py_DECREF(posobj); PyErr_SetFromErrno(PyExc_IOError); return NULL; } return posobj; } -#endif +#endif /* HAVE_FTRUNCATE */ static char * mode_string(fileio *self) Modified: python/trunk/Modules/_io/iobase.c ============================================================================== --- python/trunk/Modules/_io/iobase.c (original) +++ python/trunk/Modules/_io/iobase.c Sun Jan 31 23:26:04 2010 @@ -102,8 +102,8 @@ PyDoc_STRVAR(iobase_truncate_doc, "Truncate file to size bytes.\n" "\n" - "Size defaults to the current IO position as reported by tell(). Return\n" - "the new size."); + "File pointer is left unchanged. Size defaults to the current IO\n" + "position as reported by tell(). Returns the new size."); static PyObject * iobase_truncate(PyObject *self, PyObject *args) Modified: python/trunk/Modules/_io/stringio.c ============================================================================== --- python/trunk/Modules/_io/stringio.c (original) +++ python/trunk/Modules/_io/stringio.c Sun Jan 31 23:26:04 2010 @@ -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); } Modified: python/trunk/Modules/_io/textio.c ============================================================================== --- python/trunk/Modules/_io/textio.c (original) +++ python/trunk/Modules/_io/textio.c Sun Jan 31 23:26:04 2010 @@ -2313,15 +2313,7 @@ return NULL; Py_DECREF(res); - if (pos != Py_None) { - res = PyObject_CallMethodObjArgs((PyObject *) self, - _PyIO_str_seek, pos, NULL); - if (res == NULL) - return NULL; - Py_DECREF(res); - } - - return PyObject_CallMethodObjArgs(self->buffer, _PyIO_str_truncate, NULL); + return PyObject_CallMethodObjArgs(self->buffer, _PyIO_str_truncate, pos, NULL); } static PyObject *

1 0

r77889 - python/trunk/Doc/library/unittest.rst
by michael.foord 31 Jan '10

31 Jan '10

Author: michael.foord Date: Sun Jan 31 20:59:26 2010 New Revision: 77889 Log: Minor modification to unittest documentation. Modified: python/trunk/Doc/library/unittest.rst Modified: python/trunk/Doc/library/unittest.rst ============================================================================== --- python/trunk/Doc/library/unittest.rst (original) +++ python/trunk/Doc/library/unittest.rst Sun Jan 31 20:59:26 2010 @@ -808,9 +808,9 @@ .. method:: assertSameElements(expected, actual, msg=None) - Test that sequence *expected* contains the same elements as *actual*. - When they don't an error message listing the differences between the - sequences will be generated. + Test that sequence *expected* contains the same elements as *actual*, + regardless of their order. When they don't, an error message listing + the differences between the sequences will be generated. If specified *msg* will be used as the error message on failure.

1 0