Skip to content

close(): fix exception and enable fast-close #156

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
merged 4 commits into from
Mar 5, 2024
Merged

close(): fix exception and enable fast-close #156

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e55e975
close(): fix exception and enable fast-close
bablokb Feb 28, 2024
b062ab9
added fast_close as kw-arg to Session
bablokb Mar 5, 2024
46b0a6f
fixed spelling
bablokb Mar 5, 2024
1d8cd63
blackified
bablokb Mar 5, 2024
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
7 changes: 4 additions & 3 deletions adafruit_requests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,22 +226,23 @@ def _throw_away(self, nbytes: int) -> None:
while to_read > 0:
to_read -= self._recv_into(buf, to_read)

def close(self) -> None:
def close(self, fast: bool = False) -> None:
"""Drain the remaining ESP socket buffers. We assume we already got what we wanted."""
if not self.socket:
return
# Make sure we've read all of our response.
if self._cached is None:
if self._cached is None and not fast:
if self._remaining and self._remaining > 0:
self._throw_away(self._remaining)
elif self._chunked:
while True:
chunk_header = bytes(self._readto(b"\r\n")).split(b";", 1)[0]
if not chunk_header:
break
chunk_size = int(bytes(chunk_header), 16)
if chunk_size == 0:
break
self._throw_away(chunk_size + 2)
self._parse_headers()
if self._session:
# pylint: disable=protected-access
self._session._connection_manager.free_socket(self.socket)
Expand Down