FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-141863: Use bytearray.take_bytes in asyncio.streams by cmaloney · Pull Request #141864 · python/cpython · GitHub

/ cpython Public

gh-141863: Use bytearray.take_bytes in asyncio.streams #141864

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
kumaraditya303 merged 4 commits into from
Nov 24, 2025
Conversation 2 Commits 4 Checks 48 Files changed
Merged

gh-141863: Use bytearray.take_bytes in asyncio.streams #141864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b150fc
gh-141863: Use bytearray.take_bytes in asyncio.streams
cmaloney Oct 28, 2025
41f8f33
Add blurb
cmaloney Nov 23, 2025
9321661
Fix blurb reference
cmaloney Nov 23, 2025
78a9caf
Remove gh reference
cmaloney Nov 24, 2025
File filter

Filter by extension

Filter by extension .py  (1) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
32 changes: 10 additions & 22 deletions Lib/asyncio/streams.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -667,8 +667,7 @@ async def readuntil(self, separator=b'\n'):
# adds data which makes separator be found. That's why we check for
# EOF *after* inspecting the buffer.
if self._eof:
chunk = bytes(self._buffer)
self._buffer.clear()
chunk = self._buffer.take_bytes()
raise exceptions.IncompleteReadError(chunk, None)

# _wait_for_data() will resume reading if stream was paused.
Expand All @@ -678,10 +677,9 @@ async def readuntil(self, separator=b'\n'):
raise exceptions.LimitOverrunError(
'Separator is found, but chunk is longer than limit', match_start)

chunk = self._buffer[:match_end]
del self._buffer[:match_end]
chunk = self._buffer.take_bytes(match_end)
self._maybe_resume_transport()
return bytes(chunk)
return chunk

async def read(self, n=-1):
"""Read up to `n` bytes from the stream.
Expand Down Expand Up @@ -716,20 +714,16 @@ async def read(self, n=-1):
# collect everything in self._buffer, but that would
# deadlock if the subprocess sends more than self.limit
# bytes. So just call self.read(self._limit) until EOF.
blocks = []
while True:
block = await self.read(self._limit)
if not block:
break
blocks.append(block)
return b''.join(blocks)
joined = bytearray()
while block := await self.read(self._limit):
joined += block
return joined.take_bytes()

if not self._buffer and not self._eof:
await self._wait_for_data('read')

# This will work right even if buffer is less than n bytes
data = bytes(memoryview(self._buffer)[:n])
del self._buffer[:n]
data = self._buffer.take_bytes(min(len(self._buffer), n))

self._maybe_resume_transport()
return data
Expand Down Expand Up @@ -760,18 +754,12 @@ async def readexactly(self, n):

while len(self._buffer) < n:
if self._eof:
incomplete = bytes(self._buffer)
self._buffer.clear()
incomplete = self._buffer.take_bytes()
raise exceptions.IncompleteReadError(incomplete, n)

await self._wait_for_data('readexactly')

if len(self._buffer) == n:
data = bytes(self._buffer)
self._buffer.clear()
else:
data = bytes(memoryview(self._buffer)[:n])
del self._buffer[:n]
data = self._buffer.take_bytes(n)
self._maybe_resume_transport()
return data

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2025-11-22-16-33-48.gh-issue-141863.4PLhnv.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update :ref:`asyncio-streams` to use :func:`bytearray.take_bytes` for a over
10% performance improvement on pyperformance asyncio_tcp benchmark.
Loading
Back | FazBrowse Home | New Git URL