EKIR-219 Fix linting, types

api/odl.py

@@ -243,7 +243,7 @@ def _get_hasher(self) -> Hasher:
         return self._hasher_instance
 
     def _get(
-        self, url: str, headers: dict[str, str] | None = None, *args, **kwargs
+        self, url: str, headers: dict[str, str] | None = None, *args: Any, **kwargs: Any
     ) -> Response:
         """Make a normal HTTP request, but include an authentication
         header with the credentials for the collection.

api/opds_for_distributors.py

@@ -2,7 +2,7 @@
 
 import datetime
 import json
-from collections.abc import Generator
+from collections.abc import Generator, Mapping
 from typing import TYPE_CHECKING, Any
 
 import feedparser
@@ -461,8 +461,8 @@ def __init__(
         self.api = OPDSForDistributorsAPI(_db, collection)
 
     def _get(
-        self, url: str, headers: dict[str, str]
-    ) -> tuple[int, dict[str, str], bytes]:
+        self, url: str, headers: Mapping[str, str]
+    ) -> Response:
         """Make a normal HTTP request for an OPDS feed, but add in an
         auth header with the credentials for the collection.
         """

core/opds_import.py

@@ -5,7 +5,7 @@
 import urllib
 from abc import ABC, abstractmethod
 from collections import defaultdict
-from collections.abc import Callable, Generator, Iterable, Sequence
+from collections.abc import Callable, Generator, Iterable, Mapping, Sequence
 from datetime import datetime
 from io import BytesIO
 from typing import TYPE_CHECKING, Any, Generic, TypeVar, cast, overload
@@ -1738,7 +1738,7 @@ def _get_accept_header(self) -> str:
             ]
         )
 
-    def _update_headers(self, headers: dict[str, str] | None) -> dict[str, str]:
+    def _update_headers(self, headers: Mapping[str, str] | None) -> dict[str, str]:
         headers = dict(headers) if headers else {}
         if self.username and self.password and not "Authorization" in headers:
             headers["Authorization"] = "Basic %s" % base64.b64encode(

core/util/http.py

@@ -291,7 +291,7 @@ def _request_with_timeout(
             # a generic RequestNetworkException.
             raise RequestNetworkException(url, e)
 
-        return process_response_with(  # type: ignore[no-any-return]
+        return process_response_with(
             url,
             response,
             allowed_response_codes,