diff options
| -rw-r--r-- | Lib/chunk.py | 2 | ||||
| -rw-r--r-- | Lib/io.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_fileinput.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_io.py | 4 | ||||
| -rw-r--r-- | Lib/wave.py | 4 | ||||
| -rw-r--r-- | Modules/_fileio.c | 21 |
6 files changed, 16 insertions, 20 deletions
diff --git a/Lib/chunk.py b/Lib/chunk.py index a8fbc10..32aada8 100644 --- a/Lib/chunk.py +++ b/Lib/chunk.py @@ -62,7 +62,7 @@ class Chunk: if len(self.chunkname) < 4: raise EOFError try: - self.chunksize = struct.unpack(strflag+'L', file.read(4))[0] + self.chunksize = struct.unpack_from(strflag+'L', file.read(4))[0] except struct.error: raise EOFError if inclheader: @@ -551,8 +551,6 @@ class _MemoryIOMixin(BufferedIOBase): def truncate(self, pos=None): if pos is None: pos = self._pos - else: - self._pos = max(0, pos) del self._buffer[pos:] return pos diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py index 2b7b255..b7f84c6 100644 --- a/Lib/test/test_fileinput.py +++ b/Lib/test/test_fileinput.py @@ -18,7 +18,8 @@ from fileinput import FileInput, hook_encoded def writeTmp(i, lines, mode='w'): # opening in text mode is the default name = TESTFN + str(i) f = open(name, mode) - f.writelines(lines) + for line in lines: + f.write(line) f.close() return name diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 737dfab..1f6be02 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -93,7 +93,7 @@ class IOTest(unittest.TestCase): 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) def read_ops(self, f, buffered=False): data = f.read(5) @@ -135,7 +135,7 @@ class IOTest(unittest.TestCase): 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") diff --git a/Lib/wave.py b/Lib/wave.py index 08c51ba..dd5a47a 100644 --- a/Lib/wave.py +++ b/Lib/wave.py @@ -256,9 +256,9 @@ class Wave_read: # def _read_fmt_chunk(self, chunk): - wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack('<hhllh', chunk.read(14)) + wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack_from('<hhllh', chunk.read(14)) if wFormatTag == WAVE_FORMAT_PCM: - sampwidth = struct.unpack('<h', chunk.read(2))[0] + sampwidth = struct.unpack_from('<h', chunk.read(2))[0] self._sampwidth = (sampwidth + 7) // 8 else: raise Error, 'unknown format: %r' % (wFormatTag,) diff --git a/Modules/_fileio.c b/Modules/_fileio.c index 97b2199..d524aa7 100644 --- a/Modules/_fileio.c +++ b/Modules/_fileio.c @@ -519,7 +519,7 @@ fileio_truncate(PyFileIOObject *self, PyObject *args) { PyObject *posobj = NULL; Py_off_t pos; - int fd, whence; + int fd; fd = self->fd; if (fd < 0) @@ -530,17 +530,14 @@ fileio_truncate(PyFileIOObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "|O", &posobj)) return NULL; - if (posobj == Py_None) - posobj = NULL; - - if (posobj == NULL) - whence = 1; - else - whence = 0; - - posobj = portable_lseek(fd, posobj, whence); - if (posobj == NULL) - return NULL; + if (posobj == Py_None || posobj == NULL) { + posobj = portable_lseek(fd, NULL, 1); + if (posobj == NULL) + return NULL; + } + else { + Py_INCREF(posobj); + } #if !defined(HAVE_LARGEFILE_SUPPORT) pos = PyInt_AsLong(posobj); |