bumble 0.0.220__py3-none-any.whl → 0.0.222__py3-none-any.whl

bumble/core.py

@@ -20,15 +20,11 @@ from __future__ import annotations
 import dataclasses
 import enum
 import struct
+from collections.abc import Iterable
 from typing import (
-    TYPE_CHECKING,
     Any,
     ClassVar,
-    Iterable,
     Literal,
-    Optional,
-    Type,
-    Union,
     cast,
     overload,
 )
@@ -103,7 +99,7 @@ class BaseError(BaseBumbleError):
 
     def __init__(
         self,
-        error_code: Optional[int],
+        error_code: int | None,
         error_namespace: str = '',
         error_name: str = '',
         details: str = '',
@@ -216,11 +212,9 @@ class UUID:
     UUIDS: list[UUID] = []  # Registry of all instances created
 
     uuid_bytes: bytes
-    name: Optional[str]
+    name: str | None
 
-    def __init__(
-        self, uuid_str_or_int: Union[str, int], name: Optional[str] = None
-    ) -> None:
+    def __init__(self, uuid_str_or_int: str | int, name: str | None = None) -> None:
         if isinstance(uuid_str_or_int, int):
             self.uuid_bytes = struct.pack('<H', uuid_str_or_int)
         else:
@@ -253,7 +247,7 @@ class UUID:
         return self
 
     @classmethod
-    def from_bytes(cls, uuid_bytes: bytes, name: Optional[str] = None) -> UUID:
+    def from_bytes(cls, uuid_bytes: bytes, name: str | None = None) -> UUID:
         if len(uuid_bytes) in (2, 4, 16):
             self = cls.__new__(cls)
             self.uuid_bytes = uuid_bytes
@@ -264,11 +258,11 @@ class UUID:
         raise InvalidArgumentError('only 2, 4 and 16 bytes are allowed')
 
     @classmethod
-    def from_16_bits(cls, uuid_16: int, name: Optional[str] = None) -> UUID:
+    def from_16_bits(cls, uuid_16: int, name: str | None = None) -> UUID:
         return cls.from_bytes(struct.pack('<H', uuid_16), name)
 
     @classmethod
-    def from_32_bits(cls, uuid_32: int, name: Optional[str] = None) -> UUID:
+    def from_32_bits(cls, uuid_32: int, name: str | None = None) -> UUID:
         return cls.from_bytes(struct.pack('<I', uuid_32), name)
 
     @classmethod
@@ -734,7 +728,7 @@ class ClassOfDevice:
         MajorDeviceClass.HEALTH: HEALTH_MINOR_DEVICE_CLASS_LABELS,
     }
 
-    _MINOR_DEVICE_CLASSES: ClassVar[dict[MajorDeviceClass, Type]] = {
+    _MINOR_DEVICE_CLASSES: ClassVar[dict[MajorDeviceClass, type]] = {
         MajorDeviceClass.COMPUTER: ComputerMinorDeviceClass,
         MajorDeviceClass.PHONE: PhoneMinorDeviceClass,
         MajorDeviceClass.LAN_NETWORK_ACCESS_POINT: LanNetworkMinorDeviceClass,
@@ -749,17 +743,17 @@ class ClassOfDevice:
 
     major_service_classes: MajorServiceClasses
     major_device_class: MajorDeviceClass
-    minor_device_class: Union[
-        ComputerMinorDeviceClass,
-        PhoneMinorDeviceClass,
-        LanNetworkMinorDeviceClass,
-        AudioVideoMinorDeviceClass,
-        PeripheralMinorDeviceClass,
-        WearableMinorDeviceClass,
-        ToyMinorDeviceClass,
-        HealthMinorDeviceClass,
-        int,
-    ]
+    minor_device_class: (
+        ComputerMinorDeviceClass
+        | PhoneMinorDeviceClass
+        | LanNetworkMinorDeviceClass
+        | AudioVideoMinorDeviceClass
+        | PeripheralMinorDeviceClass
+        | WearableMinorDeviceClass
+        | ToyMinorDeviceClass
+        | HealthMinorDeviceClass
+        | int
+    )
 
     @classmethod
     def from_int(cls, class_of_device: int) -> Self:
@@ -1548,7 +1542,7 @@ class DataType:
         return f"{self.__class__.__name__}({self.value_string()})"
 
     @classmethod
-    def from_advertising_data(cls, advertising_data: AdvertisingData) -> Optional[Self]:
+    def from_advertising_data(cls, advertising_data: AdvertisingData) -> Self | None:
         if (data := advertising_data.get(cls.ad_type, raw=True)) is None:
             return None
 
@@ -1576,16 +1570,16 @@ class DataType:
 # -----------------------------------------------------------------------------
 # Advertising Data
 # -----------------------------------------------------------------------------
-AdvertisingDataObject = Union[
-    list[UUID],
-    tuple[UUID, bytes],
-    bytes,
-    str,
-    int,
-    tuple[int, int],
-    tuple[int, bytes],
-    Appearance,
-]
+AdvertisingDataObject = (
+    list[UUID]
+    | tuple[UUID, bytes]
+    | bytes
+    | str
+    | int
+    | tuple[int, int]
+    | tuple[int, bytes]
+    | Appearance
+)
 
 
 class AdvertisingData:
@@ -1722,7 +1716,7 @@ class AdvertisingData:
 
     def __init__(
         self,
-        ad_structures: Optional[Iterable[Union[tuple[int, bytes], DataType]]] = None,
+        ad_structures: Iterable[tuple[int, bytes] | DataType] | None = None,
     ) -> None:
         if ad_structures is None:
             ad_structures = []
@@ -2020,7 +2014,7 @@ class AdvertisingData:
             AdvertisingData.Type.LIST_OF_128_BIT_SERVICE_SOLICITATION_UUIDS,
         ],
         raw: Literal[False] = False,
-    ) -> Optional[list[UUID]]: ...
+    ) -> list[UUID] | None: ...
 
     @overload
     def get(
@@ -2031,7 +2025,7 @@ class AdvertisingData:
             AdvertisingData.Type.SERVICE_DATA_128_BIT_UUID,
         ],
         raw: Literal[False] = False,
-    ) -> Optional[tuple[UUID, bytes]]: ...
+    ) -> tuple[UUID, bytes] | None: ...
 
     @overload
     def get(
@@ -2043,7 +2037,7 @@ class AdvertisingData:
             AdvertisingData.Type.BROADCAST_NAME,
         ],
         raw: Literal[False] = False,
-    ) -> Optional[Optional[str]]: ...
+    ) -> str | None: ...
 
     @overload
     def get(
@@ -2055,38 +2049,36 @@ class AdvertisingData:
             AdvertisingData.Type.CLASS_OF_DEVICE,
         ],
         raw: Literal[False] = False,
-    ) -> Optional[int]: ...
+    ) -> int | None: ...
 
     @overload
     def get(
         self,
         type_id: Literal[AdvertisingData.Type.PERIPHERAL_CONNECTION_INTERVAL_RANGE,],
         raw: Literal[False] = False,
-    ) -> Optional[tuple[int, int]]: ...
+    ) -> tuple[int, int] | None: ...
 
     @overload
     def get(
         self,
         type_id: Literal[AdvertisingData.Type.MANUFACTURER_SPECIFIC_DATA,],
         raw: Literal[False] = False,
-    ) -> Optional[tuple[int, bytes]]: ...
+    ) -> tuple[int, bytes] | None: ...
 
     @overload
     def get(
         self,
         type_id: Literal[AdvertisingData.Type.APPEARANCE,],
         raw: Literal[False] = False,
-    ) -> Optional[Appearance]: ...
+    ) -> Appearance | None: ...
 
     @overload
-    def get(self, type_id: int, raw: Literal[True]) -> Optional[bytes]: ...
+    def get(self, type_id: int, raw: Literal[True]) -> bytes | None: ...
 
     @overload
-    def get(
-        self, type_id: int, raw: bool = False
-    ) -> Optional[AdvertisingDataObject]: ...
+    def get(self, type_id: int, raw: bool = False) -> AdvertisingDataObject | None: ...
 
-    def get(self, type_id: int, raw: bool = False) -> Optional[AdvertisingDataObject]:
+    def get(self, type_id: int, raw: bool = False) -> AdvertisingDataObject | None:
         '''
         Get advertising data as a simple AdvertisingDataObject object.
 

bumble/crypto/__init__.py

@@ -25,10 +25,11 @@ try:
     from bumble.crypto.cryptography import EccKey, aes_cmac, e
 except ImportError:
     logging.getLogger(__name__).debug(
-        "Unable to import cryptography, use built-in primitives."
+        "Unable to import cryptography, using built-in primitives."
     )
     from bumble.crypto.builtin import EccKey, aes_cmac, e  # type: ignore[assignment]
 
+_EccKey = EccKey  # For the linter only
 
 # -----------------------------------------------------------------------------
 # Logging

bumble/crypto/builtin.py

@@ -29,7 +29,6 @@ import dataclasses
 import functools
 import secrets
 import struct
-from typing import Optional
 
 from bumble import core
 
@@ -85,7 +84,6 @@ class _AES:
     # fmt: on
 
     def __init__(self, key: bytes) -> None:
-
         if len(key) not in (16, 24, 32):
             raise core.InvalidArgumentError(f'Invalid key size {len(key)}')
 
@@ -112,7 +110,6 @@ class _AES:
         r_con_pointer = 0
         t = kc
         while t < round_key_count:
-
             tt = tk[kc - 1]
             tk[0] ^= (
                 (self._S[(tt >> 16) & 0xFF] << 24)
@@ -269,7 +266,6 @@ class _ECB:
 
 
 class _CBC:
-
     def __init__(self, key: bytes, iv: bytes = bytes(16)) -> None:
         if len(iv) != 16:
             raise core.InvalidArgumentError(
@@ -302,7 +298,6 @@ class _CBC:
 
 
 class _CMAC:
-
     def __init__(
         self,
         key: bytes,
@@ -313,7 +308,7 @@ class _CMAC:
         self.digest_size = mac_len
         self._key = key
         self._block_size = bs = 16
-        self._mac_tag: Optional[bytes] = None
+        self._mac_tag: bytes | None = None
         self._update_after_digest = update_after_digest
 
         # Section 5.3 of NIST SP 800 38B and Appendix B
@@ -352,7 +347,7 @@ class _CMAC:
         self._last_ct = zero_block
 
         # Last block that was encrypted with AES
-        self._last_pt: Optional[bytes] = None
+        self._last_pt: bytes | None = None
 
         # Counter for total message size
         self._data_size = 0
@@ -414,7 +409,6 @@ class _CMAC:
         self._last_pt = _xor(second_last, data_block[-bs:])
 
     def digest(self) -> bytes:
-
         bs = self._block_size
 
         if self._mac_tag is not None and not self._update_after_digest:

bumble/data_types.py

@@ -25,7 +25,8 @@ from __future__ import annotations
 import dataclasses
 import math
 import struct
-from typing import Any, ClassVar, Sequence
+from collections.abc import Sequence
+from typing import Any, ClassVar
 
 from typing_extensions import Self
 

bumble/decoder.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Union
 
 # -----------------------------------------------------------------------------
 # Constants
@@ -167,12 +166,12 @@ class G722Decoder:
         # The initial value in BLOCK 3H
         self._band[1].det = 8
 
-    def decode_frame(self, encoded_data: Union[bytes, bytearray]) -> bytearray:
+    def decode_frame(self, encoded_data: bytes | bytearray) -> bytearray:
         result_array = bytearray(len(encoded_data) * 4)
         self.g722_decode(result_array, encoded_data)
         return result_array
 
-    def g722_decode(self, result_array, encoded_data: Union[bytes, bytearray]) -> int:
+    def g722_decode(self, result_array, encoded_data: bytes | bytearray) -> int:
         """Decode the data frame using g722 decoder."""
         result_length = 0