Skip to content

gh-155389: Return bytes from _pyio.BytesIO.peek() #155390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 2 commits into from
Aug 16, 2026
+17 −2
Merged

gh-155389: Return bytes from _pyio.BytesIO.peek() #155390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b786a5e
gh-155389: Return bytes from _pyio.BytesIO.peek()
fedonman Aug 8, 2026
deeeb33
Keep only the slicing under the lock, and test a float size
fedonman Aug 8, 2026
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
14 changes: 12 additions & 2 deletions Lib/_pyio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,9 +1003,19 @@ def tell(self):
def peek(self, size=0):
if self.closed:
raise ValueError("peek on closed file")
try:
size_index = size.__index__
Comment thread
cmaloney marked this conversation as resolved.
except AttributeError:
raise TypeError(f"{size!r} is not an integer")
else:
size = size_index()

if size < 1:
return self._buffer[self._pos:self._pos + io.DEFAULT_BUFFER_SIZE]
return self._buffer[self._pos:self._pos + size]
size = io.DEFAULT_BUFFER_SIZE

with self._lock:
b = self._buffer[self._pos:self._pos + size]
return b.take_bytes()

def truncate(self, pos=None):
if self.closed:
Expand Down
5 changes: 5 additions & 0 deletions Lib/test/test_io/test_memoryio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,11 @@ def test_peek(self):
buf = self.buftype("1234567890")
with self.ioclass(buf) as memio:
self.assertEqual(memio.tell(), 0)
# bytearray(b'1') == b'1', so the type has to be asserted separately.
self.assertIsInstance(memio.peek(), bytes)
self.assertIsInstance(memio.peek(1), bytes)
self.assertEqual(memio.peek(IntLike(3)), buf[:3])
self.assertRaises(TypeError, memio.peek, 1.5)
self.assertEqual(memio.peek(1), buf[:1])
self.assertEqual(memio.peek(1), buf[:1])
self.assertEqual(memio.peek(), buf)
Expand Down
Loading