Skip to content

Replace asyncio.wait_for with async-timeout #480

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
Jul 21, 2023
Merged

Replace asyncio.wait_for with async-timeout #480

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
dae93fd
Replace asyncio.wait_for with asyncio.timeout
bdraco Jul 21, 2023
fe6a6f5
Replace asyncio.wait_for with asyncio.timeout
bdraco Jul 21, 2023
16c9711
drop asyncio.timeout until cpython 3.12 is the min supported
bdraco Jul 21, 2023
061f462
drop asyncio.timeout until cpython 3.11 is the min supported
bdraco Jul 21, 2023
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
13 changes: 9 additions & 4 deletions kasa/protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
from pprint import pformat as pf
from typing import Dict, Generator, Optional, Union

# When support for cpython older than 3.11 is dropped
# async_timeout can be replaced with asyncio.timeout
from async_timeout import timeout as asyncio_timeout

from .exceptions import SmartDeviceException
from .json import dumps as json_dumps
from .json import loads as json_loads
Expand Down Expand Up @@ -79,8 +83,10 @@ async def _connect(self, timeout: int) -> None:
if self.writer:
return
self.reader = self.writer = None

task = asyncio.open_connection(self.host, self.port)
self.reader, self.writer = await asyncio.wait_for(task, timeout=timeout)
async with asyncio_timeout(timeout):
self.reader, self.writer = await task

async def _execute_query(self, request: str) -> Dict:
"""Execute a query on the device and wait for the response."""
Expand Down Expand Up @@ -155,9 +161,8 @@ async def _query(self, request: str, retry_count: int, timeout: int) -> Dict:
try:
assert self.reader is not None
assert self.writer is not None
return await asyncio.wait_for(
self._execute_query(request), timeout=timeout
)
async with asyncio_timeout(timeout):
return await self._execute_query(request)
except Exception as ex:
await self.close()
if retry >= retry_count:
Expand Down
14 changes: 13 additions & 1 deletion poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ sphinx_rtd_theme = { version = "^0", optional = true }
sphinxcontrib-programoutput = { version = "^0", optional = true }
myst-parser = { version = "*", optional = true }
docutils = { version = ">=0.17", optional = true }
async-timeout = ">=3.0.0"

[tool.poetry.dev-dependencies]
pytest = "*"
Expand Down