From cb981a73f3be4a7a084ce65cf35038393bc4bac1 Mon Sep 17 00:00:00 2001 From: sepro Date: Mon, 3 Mar 2025 01:34:01 +0100 Subject: [PATCH] Revert custom header casing code --- yt_dlp/extractor/rtp.py | 5 ++--- yt_dlp/networking/common.py | 3 +-- yt_dlp/utils/networking.py | 16 ---------------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/yt_dlp/extractor/rtp.py b/yt_dlp/extractor/rtp.py index 022b4b05e..e4ab26059 100644 --- a/yt_dlp/extractor/rtp.py +++ b/yt_dlp/extractor/rtp.py @@ -12,7 +12,6 @@ parse_iso8601, url_or_none, ) -from ..utils.networking import CaseSensitiveDict from ..utils.traversal import traverse_obj @@ -76,13 +75,13 @@ def _fetch_auth_token(self): return self._AUTH_TOKEN self._AUTH_TOKEN = traverse_obj(self._download_json(Request( url='https://rtpplayapi.rtp.pt/play/api/2/token-manager', - headers=CaseSensitiveDict({ + headers={ 'Accept': '*/*', 'rtp-play-auth': 'RTPPLAY_MOBILE_IOS', 'rtp-play-auth-hash': 'fac9c328b2f27e26e03d7f8942d66c05b3e59371e16c2a079f5c83cc801bd3ee', 'rtp-play-auth-timestamp': '2145973229682', 'User-Agent': self._USER_AGENT, - })), None, note='Fetching guest auth token', errnote='Could not fetch guest auth token', + }), None, note='Fetching guest auth token', errnote='Could not fetch guest auth token', fatal=False), ('token', 'token', {str})) return self._AUTH_TOKEN diff --git a/yt_dlp/networking/common.py b/yt_dlp/networking/common.py index d3a5f4e75..e8951c7e7 100644 --- a/yt_dlp/networking/common.py +++ b/yt_dlp/networking/common.py @@ -257,8 +257,7 @@ def _make_sslcontext(self, legacy_ssl_support=None): ) def _merge_headers(self, request_headers): - header_type = type(request_headers) if isinstance(request_headers, HTTPHeaderDict) else HTTPHeaderDict - return header_type(self.headers, request_headers) + return HTTPHeaderDict(self.headers, request_headers) def _calculate_timeout(self, request): return float(request.extensions.get('timeout') or self.timeout) diff --git a/yt_dlp/utils/networking.py b/yt_dlp/utils/networking.py index 96e4b30eb..933b164be 100644 --- a/yt_dlp/utils/networking.py +++ b/yt_dlp/utils/networking.py @@ -79,22 +79,6 @@ def __contains__(self, key): return super().__contains__(key.title() if isinstance(key, str) else key) -class CaseSensitiveDict(HTTPHeaderDict): - def __setitem__(self, key, value): - if isinstance(value, bytes): - value = value.decode('latin-1') - self.data[key] = str(value).strip() - - def __getitem__(self, key): - return self.data[key] - - def __delitem__(self, key): - del self.data[key] - - def __contains__(self, key): - return key in self.data - - std_headers = HTTPHeaderDict({ 'User-Agent': random_user_agent(), 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',