diff options
Diffstat (limited to 'yt_dlp/extractor')
| -rw-r--r-- | yt_dlp/extractor/_extractors.py | 2 | ||||
| -rw-r--r-- | yt_dlp/extractor/abematv.py | 4 | ||||
| -rw-r--r-- | yt_dlp/extractor/common.py | 2 | ||||
| -rw-r--r-- | yt_dlp/extractor/dailywire.py | 4 | ||||
| -rw-r--r-- | yt_dlp/extractor/generic.py | 1 | ||||
| -rw-r--r-- | yt_dlp/extractor/iqiyi.py | 4 |
6 files changed, 7 insertions, 10 deletions
diff --git a/yt_dlp/extractor/_extractors.py b/yt_dlp/extractor/_extractors.py index 383a05a56..3e63df6cb 100644 --- a/yt_dlp/extractor/_extractors.py +++ b/yt_dlp/extractor/_extractors.py @@ -704,12 +704,10 @@ from .iqiyi import ( IqIE, IqAlbumIE ) - from .itprotv import ( ITProTVIE, ITProTVCourseIE ) - from .itv import ( ITVIE, ITVBTCCIE, diff --git a/yt_dlp/extractor/abematv.py b/yt_dlp/extractor/abematv.py index 1b9deeae8..81a6542c3 100644 --- a/yt_dlp/extractor/abematv.py +++ b/yt_dlp/extractor/abematv.py @@ -16,7 +16,7 @@ from ..compat import compat_urllib_parse_urlparse, compat_urllib_request from ..utils import ( ExtractorError, bytes_to_intlist, - decode_base, + decode_base_n, int_or_none, intlist_to_bytes, request_to_url, @@ -123,7 +123,7 @@ class AbemaLicenseHandler(compat_urllib_request.BaseHandler): 'Content-Type': 'application/json', }) - res = decode_base(license_response['k'], self.STRTABLE) + res = decode_base_n(license_response['k'], table=self.STRTABLE) encvideokey = bytes_to_intlist(struct.pack('>QQ', res >> 64, res & 0xffffffffffffffff)) h = hmac.new( diff --git a/yt_dlp/extractor/common.py b/yt_dlp/extractor/common.py index 3e3e55798..3e8ba5bdd 100644 --- a/yt_dlp/extractor/common.py +++ b/yt_dlp/extractor/common.py @@ -2817,7 +2817,7 @@ class InfoExtractor: base_url = '' for element in (representation, adaptation_set, period, mpd_doc): base_url_e = element.find(_add_ns('BaseURL')) - if base_url_e is not None: + if base_url_e and base_url_e.text: base_url = base_url_e.text + base_url if re.match(r'^https?://', base_url): break diff --git a/yt_dlp/extractor/dailywire.py b/yt_dlp/extractor/dailywire.py index 5a1476183..1f27797ad 100644 --- a/yt_dlp/extractor/dailywire.py +++ b/yt_dlp/extractor/dailywire.py @@ -73,9 +73,7 @@ class DailyWireIE(DailyWireBaseIE): 'display_id': slug, 'title': traverse_obj(episode_info, 'title', 'name'), 'description': episode_info.get('description'), - 'creator': join_nonempty( - traverse_obj(episode_info, ('createdBy','firstName')), traverse_obj(episode_info, ('createdBy','lastName')), - delim=' '), + 'creator': join_nonempty(('createdBy', 'firstName'), ('createdBy', 'lastName'), from_dict=episode_info, delim=' '), 'duration': float_or_none(episode_info.get('duration')), 'is_live': episode_info.get('isLive'), 'thumbnail': traverse_obj(episode_info, 'thumbnail', 'image', expected_type=url_or_none), diff --git a/yt_dlp/extractor/generic.py b/yt_dlp/extractor/generic.py index 845ce5298..b8c5be7a0 100644 --- a/yt_dlp/extractor/generic.py +++ b/yt_dlp/extractor/generic.py @@ -3116,6 +3116,7 @@ class GenericIE(InfoExtractor): wistia_urls = WistiaIE._extract_urls(webpage) if wistia_urls: playlist = self.playlist_from_matches(wistia_urls, video_id, video_title, ie=WistiaIE.ie_key()) + playlist['entries'] = list(playlist['entries']) for entry in playlist['entries']: entry.update({ '_type': 'url_transparent', diff --git a/yt_dlp/extractor/iqiyi.py b/yt_dlp/extractor/iqiyi.py index 8417c43c3..059b62e2a 100644 --- a/yt_dlp/extractor/iqiyi.py +++ b/yt_dlp/extractor/iqiyi.py @@ -37,7 +37,7 @@ def md5_text(text): return hashlib.md5(text.encode('utf-8')).hexdigest() -class IqiyiSDK(object): +class IqiyiSDK: def __init__(self, target, ip, timestamp): self.target = target self.ip = ip @@ -131,7 +131,7 @@ class IqiyiSDK(object): self.target = self.digit_sum(self.timestamp) + chunks[0] + compat_str(sum(ip)) -class IqiyiSDKInterpreter(object): +class IqiyiSDKInterpreter: def __init__(self, sdk_code): self.sdk_code = sdk_code |