chore: remove types-requests and fix issues

bastimeyer · bastimeyer · commit 58abde8e08ef · 2026-05-13T19:26:34.000+02:00
- Fix various typing issues caused by the switch
  to requests' new inline typing annotations
- Simplify http.pyi based on requests' TypedDict typing data
diff --git a/pyproject.toml b/pyproject.toml
@@ -119,7 +119,6 @@ typing = [
   "lxml-stubs",
   "types-docutils",
   "types-freezegun",
-  "types-requests",
   "types-setuptools",
 ]
 docs = [
diff --git a/src/streamlink/compat.py b/src/streamlink/compat.py
@@ -13,7 +13,7 @@
 except ImportError:  # pragma: no cover
     from exceptiongroup import BaseExceptionGroup, ExceptionGroup  # type: ignore[import, ty:unresolved-import]
 
-from requests.compat import chardet as charset_normalizer  # type: ignore[attr-defined, ty:unresolved-import]
+from requests.compat import chardet as charset_normalizer
 
 from streamlink.exceptions import StreamlinkDeprecationWarning
 
diff --git a/src/streamlink/plugins/openrectv.py b/src/streamlink/plugins/openrectv.py
@@ -98,8 +98,8 @@ def _get_movie_data(self):
         res = self.session.http.get(
             url,
             headers={
-                "access-token": self.session.http.cookies.get("access_token"),
-                "uuid": self.session.http.cookies.get("uuid"),
+                "access-token": self.session.http.cookies.get("access_token") or "",
+                "uuid": self.session.http.cookies.get("uuid") or "",
             },
         )
         data = self.session.http.json(res, schema=self._info_schema)
@@ -115,8 +115,8 @@ def _get_subscription_movie_data(self):
         res = self.session.http.get(
             url,
             headers={
-                "access-token": self.session.http.cookies.get("access_token"),
-                "uuid": self.session.http.cookies.get("uuid"),
+                "access-token": self.session.http.cookies.get("access_token") or "",
+                "uuid": self.session.http.cookies.get("uuid") or "",
             },
         )
         data = self.session.http.json(res, schema=self._subscription_schema)
diff --git a/src/streamlink/plugins/twitch.py b/src/streamlink/plugins/twitch.py
@@ -995,7 +995,7 @@ def _get_hls_streams(self, url: str, restricted_bitrates: list[str], **extra_par
         except OSError as err:
             # TODO: fix the "err" attribute set by HTTPSession.request()
             orig = getattr(err, "err", None)
-            if isinstance(orig, HTTPError) and orig.response.status_code >= 400:
+            if isinstance(orig, HTTPError) and orig.response is not None and orig.response.status_code >= 400:
                 # The playlist's error response may include JSON data with an error message
                 with suppress(PluginError):
                     error = validate.Schema(
diff --git a/src/streamlink/session/http.py b/src/streamlink/session/http.py
@@ -201,10 +201,15 @@ def set_interface(self, interface: str | None) -> None:
             adapter.poolmanager.connection_pool_kw.pop("socket_options", None)
             adapter.poolmanager.connection_pool_kw.update(connection_pool_kw)
 
-    def mount(self, prefix: str | bytes, adapter: BaseAdapter) -> None:
+    def mount(self, prefix: str, adapter: BaseAdapter) -> None:
         # Update poolmanager connection kwargs for HTTPAdapters mounted after interface options were set
-        if isinstance(adapter, HTTPAdapter) and "http://" in self.adapters and "https://" in self.adapters:
-            default_adapter_connection_pool_kw = cast("HTTPAdapter", self.adapters["https://"]).poolmanager.connection_pool_kw
+        if (
+            isinstance(adapter, HTTPAdapter)
+            and "http://" in self.adapters
+            and (https_adapter := self.adapters.get("https://"))
+            and isinstance(https_adapter, HTTPAdapter)
+        ):
+            default_adapter_connection_pool_kw = https_adapter.poolmanager.connection_pool_kw
             adapter.poolmanager.connection_pool_kw.update({
                 "source_address": default_adapter_connection_pool_kw.get("source_address"),
                 "socket_options": default_adapter_connection_pool_kw.get("socket_options"),
diff --git a/src/streamlink/session/http.pyi b/src/streamlink/session/http.pyi

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,6 @@ typing = [`
`119`	`119`	`"lxml-stubs",`
`120`	`120`	`"types-docutils",`
`121`	`121`	`"types-freezegun",`
`122`		`- "types-requests",`
`123`	`122`	`"types-setuptools",`
`124`	`123`	`]`
`125`	`124`	`docs = [`