Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Lib/_pyio.py
Original file line number Diff line number Diff line change
Expand Up @@ -1198,7 +1198,8 @@ def _readinto(self, buf, read1):
while written < len(buf):

# First try to read from internal buffer
avail = min(len(self._read_buf) - self._read_pos, len(buf))
avail = min(len(self._read_buf) - self._read_pos,
len(buf) - written)
if avail:
buf[written:written+avail] = \
self._read_buf[self._read_pos:self._read_pos+avail]
Expand Down
8 changes: 8 additions & 0 deletions Lib/test/test_io/test_bufferedio.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,14 @@ def test_readinto(self):
self.assertEqual(bufio.readinto(b), 1)
self.assertEqual(b, b"cb")

def test_readinto_with_remaining_buffered_data(self):
bufio = self.tp(self.BytesIO(b"abcd"), buffer_size=2)
self.assertEqual(bufio.read(1), b"a")
b = bytearray(2)
self.assertEqual(bufio.readinto(b), 2)
self.assertEqual(b, b"bc")
self.assertEqual(bufio.read(), b"d")

def test_readinto1(self):
buffer_size = 10
rawio = self.MockRawIO((b"abc", b"de", b"fgh", b"jkl"))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix the pure Python implementation of ``BufferedReader.readinto()`` raising
:exc:`ValueError` after partially filling the destination buffer.
Loading