Skip to content

feat: drop async_timeout requirement for python 3.11+ #1107

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
bdraco merged 4 commits into from
Dec 17, 2022
Merged

feat: drop async_timeout requirement for python 3.11+ #1107

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
c798599
feat: drop async_timeout requirement for python 3.11+
bdraco Dec 17, 2022
893ff78
feat: drop async_timeout requirement for python 3.11+
bdraco Dec 17, 2022
c8952f2
Merge branch 'master' into async_timeout
bdraco Dec 17, 2022
219e261
Merge branch 'master' into async_timeout
bdraco Dec 17, 2022
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
2 changes: 1 addition & 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.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ tag_format = "{version}"

[tool.poetry.dependencies]
python = "^3.7"
async-timeout = ">=3.0.1"
async-timeout = {version = ">=3.0.0", python = "<3.11"}
ifaddr = ">=0.1.7"

[tool.poetry.group.dev.dependencies]
Expand Down
8 changes: 6 additions & 2 deletions src/zeroconf/_utils/asyncio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,13 @@
import asyncio
import concurrent.futures
import contextlib
import sys
from typing import Any, Awaitable, Coroutine, Optional, Set

import async_timeout
if sys.version_info[:2] < (3, 11):
from async_timeout import timeout as asyncio_timeout
else:
from asyncio import timeout as asyncio_timeout

from .._exceptions import EventLoopBlocked
from ..const import _LOADED_SYSTEM_TIMEOUT
Expand All @@ -40,7 +44,7 @@
async def wait_event_or_timeout(event: asyncio.Event, timeout: float) -> None:
"""Wait for an event or timeout."""
with contextlib.suppress(asyncio.TimeoutError):
async with async_timeout.timeout(timeout):
async with asyncio_timeout(timeout):
await event.wait()


Expand Down