Skip to content
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

Use bytearray() in FrameBuffer #1300

Merged
merged 2 commits into from
Feb 27, 2025
Merged

Use bytearray() in FrameBuffer #1300

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2da5ba1
perf(FrameBuffer.data): use bytearray()
deedy5 Feb 26, 2025
9cb923d
refactor(FrameBuffer): rename self.data to self._data
deedy5 Feb 26, 2025
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: 7 additions & 7 deletions src/h2/frame_buffer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class FrameBuffer:
"""

def __init__(self, server: bool = False) -> None:
self.data = b""
self._data = bytearray()
self.max_frame_size = 0
self._preamble = b"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" if server else b""
self._preamble_len = len(self._preamble)
Expand All @@ -54,7 +54,7 @@ def add_data(self, data: bytes) -> None:
self._preamble_len -= of_which_preamble
self._preamble = self._preamble[of_which_preamble:]

self.data += data
self._data += data

def _validate_frame_length(self, length: int) -> None:
"""
Expand Down Expand Up @@ -119,26 +119,26 @@ def __iter__(self) -> FrameBuffer:
def __next__(self) -> Frame:
# First, check that we have enough data to successfully parse the
# next frame header. If not, bail. Otherwise, parse it.
if len(self.data) < 9:
if len(self._data) < 9:
raise StopIteration

try:
f, length = Frame.parse_frame_header(memoryview(self.data[:9]))
f, length = Frame.parse_frame_header(memoryview(self._data[:9]))
except (InvalidDataError, InvalidFrameError) as err: # pragma: no cover
msg = f"Received frame with invalid header: {err!s}"
raise ProtocolError(msg) from err

# Next, check that we have enough length to parse the frame body. If
# not, bail, leaving the frame header data in the buffer for next time.
if len(self.data) < length + 9:
if len(self._data) < length + 9:
raise StopIteration

# Confirm the frame has an appropriate length.
self._validate_frame_length(length)

# Try to parse the frame body
try:
f.parse_body(memoryview(self.data[9:9+length]))
f.parse_body(memoryview(self._data[9:9+length]))
except InvalidDataError as err:
msg = "Received frame with non-compliant data"
raise ProtocolError(msg) from err
Expand All @@ -148,7 +148,7 @@ def __next__(self) -> Frame:

# At this point, as we know we'll use or discard the entire frame, we
# can update the data.
self.data = self.data[9+length:]
self._data = self._data[9+length:]

# Pass the frame through the header buffer.
new_frame = self._update_header_buffer(f)
Expand Down