rollback collections.abc imports

Author: o-murphy

bleak/__init__.py

@@ -2,6 +2,8 @@
 
 """Top-level package for bleak."""
 
+from __future__ import annotations
+
 __author__ = """Henrik Blidh"""
 __email__ = "[email protected]"
 
@@ -12,20 +14,9 @@
 import os
 import sys
 import uuid
+from collections.abc import AsyncGenerator, Awaitable, Callable, Iterable
 from types import TracebackType
-from typing import (
-    Any,
-    AsyncGenerator,
-    Awaitable,
-    Callable,
-    Iterable,
-    Literal,
-    Optional,
-    TypedDict,
-    Union,
-    cast,
-    overload,
-)
+from typing import Any, Literal, Optional, TypedDict, Union, cast, overload
 
 from typing_extensions import Buffer, Never, Self, Unpack, assert_never
 

bleak/args/corebluetooth.py

@@ -4,7 +4,8 @@
 -------------------------------
 """
 
-from typing import Callable, Optional, TypedDict
+from collections.abc import Callable
+from typing import Optional, TypedDict
 
 
 class CBScannerArgs(TypedDict, total=False):

bleak/backends/bluezdbus/advertisement_monitor.py

@@ -14,7 +14,8 @@
         assert False, "This backend is only available on Linux"
 
 import logging
-from typing import Any, Iterable, no_type_check
+from collections.abc import Iterable
+from typing import Any, no_type_check
 from warnings import warn
 
 from dbus_fast import PropertyAccess

bleak/backends/bluezdbus/client.py

@@ -13,8 +13,9 @@
 import logging
 import os
 import warnings
+from collections.abc import Callable
 from contextlib import AsyncExitStack
-from typing import Any, Callable, Optional, Union
+from typing import Any, Optional, Union
 
 from typing_extensions import Buffer, override
 

bleak/backends/bluezdbus/manager.py

@@ -18,7 +18,8 @@
 import logging
 import os
 from collections import defaultdict
-from typing import Any, Callable, Coroutine, MutableMapping, NamedTuple, Optional, cast
+from collections.abc import Callable, Coroutine, MutableMapping
+from typing import Any, NamedTuple, Optional, cast
 from weakref import WeakKeyDictionary
 
 from dbus_fast import BusType, Message, MessageType, Variant, unpack_variants

bleak/backends/bluezdbus/scanner.py

@@ -6,7 +6,8 @@
         assert False, "This backend is only available on Linux"
 
 import logging
-from typing import Any, Callable, Coroutine, Literal, Optional
+from collections.abc import Callable, Coroutine
+from typing import Any, Literal, Optional
 from warnings import warn
 
 from dbus_fast import Variant

bleak/backends/bluezdbus/signals.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import annotations
+
 import sys
 from typing import TYPE_CHECKING
 
@@ -142,7 +144,7 @@ def __init__(
             self.args = None
 
     @staticmethod
-    def parse(rules: str) -> "MatchRules":
+    def parse(rules: str) -> MatchRules:
         return MatchRules(**dict(r.split("=") for r in rules.split(",")))
 
     def __str__(self) -> str:

bleak/backends/characteristic.py

@@ -6,7 +6,8 @@
 from __future__ import annotations
 
 import enum
-from typing import TYPE_CHECKING, Any, Callable, Union
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any, Union
 from uuid import UUID
 
 from bleak.assigned_numbers import CharacteristicPropertyName

bleak/backends/client.py

@@ -7,7 +7,8 @@
 import os
 import platform
 import sys
-from typing import Any, Callable, Optional, Union
+from collections.abc import Callable
+from typing import Any, Optional, Union
 
 from typing_extensions import Buffer
 

bleak/backends/corebluetooth/CentralManagerDelegate.py

@@ -14,14 +14,15 @@
 import asyncio
 import logging
 import threading
-from typing import Any, Callable, Optional
-
-from typing_extensions import Self
+from collections.abc import Callable
+from typing import Any, Optional
 
 if sys.version_info < (3, 11):
     from async_timeout import timeout as async_timeout
+    from typing_extensions import Self
 else:
     from asyncio import timeout as async_timeout
+    from typing import Self
 
 import objc
 from CoreBluetooth import (