Replace deprecated typing aliases

This commit is contained in:
Josh Wu
2025-06-07 23:29:26 +08:00
parent 3a64772cc5
commit 8a0cd5d0d1
68 changed files with 366 additions and 424 deletions

View File

@@ -24,12 +24,8 @@ import warnings
from typing import (
Any,
Awaitable,
Dict,
Type,
Tuple,
Optional,
Callable,
List,
AsyncGenerator,
Iterable,
Union,
@@ -227,7 +223,7 @@ AVDTP_STATE_NAMES = {
# -----------------------------------------------------------------------------
async def find_avdtp_service_with_sdp_client(
sdp_client: sdp.Client,
) -> Optional[Tuple[int, int]]:
) -> Optional[tuple[int, int]]:
'''
Find an AVDTP service, using a connected SDP client, and return its version,
or None if none is found
@@ -257,7 +253,7 @@ async def find_avdtp_service_with_sdp_client(
# -----------------------------------------------------------------------------
async def find_avdtp_service_with_connection(
connection: device.Connection,
) -> Optional[Tuple[int, int]]:
) -> Optional[tuple[int, int]]:
'''
Find an AVDTP service, for a connection, and return its version,
or None if none is found
@@ -451,7 +447,7 @@ class ServiceCapabilities:
service_category: int, service_capabilities_bytes: bytes
) -> ServiceCapabilities:
# Select the appropriate subclass
cls: Type[ServiceCapabilities]
cls: type[ServiceCapabilities]
if service_category == AVDTP_MEDIA_CODEC_SERVICE_CATEGORY:
cls = MediaCodecCapabilities
else:
@@ -466,7 +462,7 @@ class ServiceCapabilities:
return instance
@staticmethod
def parse_capabilities(payload: bytes) -> List[ServiceCapabilities]:
def parse_capabilities(payload: bytes) -> list[ServiceCapabilities]:
capabilities = []
while payload:
service_category = payload[0]
@@ -499,7 +495,7 @@ class ServiceCapabilities:
self.service_category = service_category
self.service_capabilities_bytes = service_capabilities_bytes
def to_string(self, details: Optional[List[str]] = None) -> str:
def to_string(self, details: Optional[list[str]] = None) -> str:
attributes = ','.join(
[name_or_number(AVDTP_SERVICE_CATEGORY_NAMES, self.service_category)]
+ (details or [])
@@ -612,7 +608,7 @@ class Message: # pylint:disable=attribute-defined-outside-init
RESPONSE_REJECT = 3
# Subclasses, by signal identifier and message type
subclasses: Dict[int, Dict[int, Type[Message]]] = {}
subclasses: dict[int, dict[int, type[Message]]] = {}
message_type: MessageType
signal_identifier: int
@@ -757,7 +753,7 @@ class Discover_Response(Message):
See Bluetooth AVDTP spec - 8.6.2 Stream End Point Discovery Response
'''
endpoints: List[EndPointInfo]
endpoints: list[EndPointInfo]
def init_from_payload(self):
self.endpoints = []
@@ -1202,10 +1198,10 @@ class DelayReport_Reject(Simple_Reject):
# -----------------------------------------------------------------------------
class Protocol(utils.EventEmitter):
local_endpoints: List[LocalStreamEndPoint]
remote_endpoints: Dict[int, DiscoveredStreamEndPoint]
streams: Dict[int, Stream]
transaction_results: List[Optional[asyncio.Future[Message]]]
local_endpoints: list[LocalStreamEndPoint]
remote_endpoints: dict[int, DiscoveredStreamEndPoint]
streams: dict[int, Stream]
transaction_results: list[Optional[asyncio.Future[Message]]]
channel_connector: Callable[[], Awaitable[l2cap.ClassicChannel]]
EVENT_OPEN = "open"
@@ -1223,7 +1219,7 @@ class Protocol(utils.EventEmitter):
@staticmethod
async def connect(
connection: device.Connection, version: Tuple[int, int] = (1, 3)
connection: device.Connection, version: tuple[int, int] = (1, 3)
) -> Protocol:
channel = await connection.create_l2cap_channel(
spec=l2cap.ClassicChannelSpec(psm=AVDTP_PSM)
@@ -1233,7 +1229,7 @@ class Protocol(utils.EventEmitter):
return protocol
def __init__(
self, l2cap_channel: l2cap.ClassicChannel, version: Tuple[int, int] = (1, 3)
self, l2cap_channel: l2cap.ClassicChannel, version: tuple[int, int] = (1, 3)
) -> None:
super().__init__()
self.l2cap_channel = l2cap_channel
@@ -1502,7 +1498,7 @@ class Protocol(utils.EventEmitter):
return response
async def start_transaction(self) -> Tuple[int, asyncio.Future[Message]]:
async def start_transaction(self) -> tuple[int, asyncio.Future[Message]]:
# Wait until we can start a new transaction
await self.transaction_semaphore.acquire()
@@ -1703,7 +1699,7 @@ class Protocol(utils.EventEmitter):
# -----------------------------------------------------------------------------
class Listener(utils.EventEmitter):
servers: Dict[int, Protocol]
servers: dict[int, Protocol]
EVENT_CONNECTION = "connection"
@@ -1735,7 +1731,7 @@ class Listener(utils.EventEmitter):
@classmethod
def for_device(
cls, device: device.Device, version: Tuple[int, int] = (1, 3)
cls, device: device.Device, version: tuple[int, int] = (1, 3)
) -> Listener:
listener = Listener(registrar=None, version=version)
l2cap_server = device.create_l2cap_server(