diff options
author | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-06 23:47:23 (GMT) |
---|---|---|
committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-06 23:47:23 (GMT) |
commit | 4833b3c37fc0d33f8f3f37a9b7526150a7c64b8c (patch) | |
tree | 9cd8c04da7cf8dcc311f919187181ed3139db5c2 /Lib | |
parent | 8dc226fccd2183670ac19a85b89941f5b05167dc (diff) | |
download | cpython-4833b3c37fc0d33f8f3f37a9b7526150a7c64b8c.zip cpython-4833b3c37fc0d33f8f3f37a9b7526150a7c64b8c.tar.gz cpython-4833b3c37fc0d33f8f3f37a9b7526150a7c64b8c.tar.bz2 |
Fixed a small bug introduced by r62778.
One of the codepaths of _BytesIO.read() returned a bytearray
object, by mistake, when it should always return a bytes object.
Interestingly, the fact this bug shown up probably means that
some platforms are not using the new C-accelerated io.BytesIO.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/io.py | 2 | ||||
-rw-r--r-- | Lib/test/test_memoryio.py | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -794,7 +794,7 @@ class _BytesIO(BufferedIOBase): if n < 0: n = len(self._buffer) if len(self._buffer) <= self._pos: - return self._buffer[:0] + return bytes(self._buffer[:0]) newpos = min(len(self._buffer), self._pos + n) b = self._buffer[self._pos : newpos] self._pos = newpos diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py index 2f5982f..1afc363 100644 --- a/Lib/test/test_memoryio.py +++ b/Lib/test/test_memoryio.py @@ -114,6 +114,8 @@ class MemoryTestMixin: self.assertEqual(memio.read(-1), buf) memio.seek(0) self.assertEqual(type(memio.read()), type(buf)) + memio.seek(100) + self.assertEqual(type(memio.read()), type(buf)) memio.seek(0) self.assertEqual(memio.read(None), buf) self.assertRaises(TypeError, memio.read, '') |