chore: make ruff / pre-commit happy

findmy/__init__.py

@@ -5,10 +5,10 @@ from .accessory import FindMyAccessory
 from .keys import KeyPair
 
 __all__ = (
+    "FindMyAccessory",
+    "KeyPair",
+    "errors",
     "keys",
     "reports",
     "scanner",
-    "errors",
-    "FindMyAccessory",
-    "KeyPair",
 )

findmy/accessory.py

@@ -9,15 +9,17 @@ from __future__ import annotations
 import logging
 import plistlib
 from abc import ABC, abstractmethod
-from collections.abc import Generator
 from datetime import datetime, timedelta, timezone
-from typing import IO, overload
+from typing import IO, TYPE_CHECKING, overload
 
 from typing_extensions import override
 
 from .keys import KeyGenerator, KeyPair, KeyType
 from .util import crypto
 
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
 logging.getLogger(__name__)
 
 

findmy/keys.py

@@ -6,15 +6,17 @@ import base64
 import hashlib
 import secrets
 from abc import ABC, abstractmethod
-from collections.abc import Generator
 from enum import Enum
-from typing import Generic, TypeVar, overload
+from typing import TYPE_CHECKING, Generic, TypeVar, overload
 
 from cryptography.hazmat.primitives.asymmetric import ec
 from typing_extensions import override
 
 from .util import crypto, parsers
 
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
 
 class KeyType(Enum):
     """Enum of possible key types."""

findmy/reports/__init__.py

@@ -8,8 +8,8 @@ from .twofactor import SmsSecondFactorMethod, TrustedDeviceSecondFactorMethod
 __all__ = (
     "AppleAccount",
     "AsyncAppleAccount",
-    "LoginState",
     "BaseAnisetteProvider",
+    "LoginState",
     "RemoteAnisetteProvider",
     "SmsSecondFactorMethod",
     "TrustedDeviceSecondFactorMethod",

findmy/reports/account.py

@@ -9,7 +9,6 @@ import logging
 import plistlib
 import uuid
 from abc import ABC, abstractmethod
-from collections.abc import Sequence
 from datetime import datetime, timedelta, timezone
 from functools import wraps
 from typing import (
@@ -49,6 +48,8 @@ from .twofactor import (
 )
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
+
     from findmy.accessory import RollingKeyPairSource
     from findmy.keys import HasHashedPublicKey
     from findmy.util.types import MaybeCoro

findmy/reports/reports.py

@@ -303,9 +303,9 @@ class LocationReportsFetcher:
 
         res: dict[HasHashedPublicKey, list[LocationReport]] = {key: [] for key in keys}
         for report in reports:
-            for key in res:
+            for key, reports in res.items():
                 if key.hashed_adv_key_bytes == report.hashed_adv_key_bytes:
-                    res[key].append(report)
+                    reports.append(report)
                     break
         return res
 

findmy/scanner/__init__.py

@@ -7,7 +7,7 @@ from .scanner import (
 )
 
 __all__ = (
-    "OfflineFindingScanner",
     "NearbyOfflineFindingDevice",
+    "OfflineFindingScanner",
     "SeparatedOfflineFindingDevice",
 )

findmy/scanner/scanner.py

@@ -6,7 +6,6 @@ import asyncio
 import logging
 import time
 from abc import ABC, abstractmethod
-from collections.abc import AsyncGenerator
 from datetime import datetime, timedelta
 from typing import TYPE_CHECKING, Any
 
@@ -17,6 +16,8 @@ from findmy.accessory import RollingKeyPairSource
 from findmy.keys import HasPublicKey
 
 if TYPE_CHECKING:
+    from collections.abc import AsyncGenerator
+
     from bleak.backends.device import BLEDevice
     from bleak.backends.scanner import AdvertisementData
 

findmy/util/__init__.py

@@ -3,4 +3,4 @@
 from .http import HttpResponse, HttpSession
 from .parsers import decode_plist
 
-__all__ = ("HttpSession", "HttpResponse", "decode_plist")
+__all__ = ("HttpResponse", "HttpSession", "decode_plist")

pyproject.toml

@@ -53,8 +53,6 @@ select = [
     "ALL",
 ]
 ignore = [
-    "ANN101", # annotations on `self`
-    "ANN102", # annotations on `cls`
     "FIX002", # resolving TODOs
 
     "D203", # one blank line before class docstring