From 1b5c9e1cb94d19925776d91196cf1b657264c494 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Tue, 1 Nov 2022 15:10:55 -0500 Subject: [PATCH] chore: drop async-timeout dependency on Python >= 3.11 (#132) --- pyproject.toml | 2 +- src/dbus_fast/aio/message_bus.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c7bce11..73f55da 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ packages = [ [tool.poetry.dependencies] python = "^3.7" -async-timeout = ">=3.0.0" +async-timeout = {version = ">=3.0.0", python = "<3.11"} # Documentation Dependencies sphinxcontrib-asyncio = {version = "^0.3.0", optional = true} diff --git a/src/dbus_fast/aio/message_bus.py b/src/dbus_fast/aio/message_bus.py index 8d5aea3..3f4ab52 100644 --- a/src/dbus_fast/aio/message_bus.py +++ b/src/dbus_fast/aio/message_bus.py @@ -2,12 +2,16 @@ import array import asyncio import logging import socket +import sys import traceback from collections import deque from copy import copy from typing import Any, Optional -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 .. import introspection as intr from .._private.unmarshaller import Unmarshaller @@ -268,7 +272,7 @@ class MessageBus(BaseMessageBus): super().introspect(bus_name, path, reply_handler) - async with async_timeout.timeout(timeout): + async with asyncio_timeout(timeout): return await future async def request_name(