[cleanup] Misc (#12694)

Authored by: seproDev

yt_dlp/extractor/bokecc.py

@@ -24,7 +24,7 @@ class BokeCCBaseIE(InfoExtractor):
 
 
 class BokeCCIE(BokeCCBaseIE):
-    _IE_DESC = 'CC视频'
+    IE_DESC = 'CC视频'
     _VALID_URL = r'https?://union\.bokecc\.com/playvideo\.bo\?(?P<query>.*)'
 
     _TESTS = [{

yt_dlp/extractor/hse.py

@@ -6,7 +6,7 @@ from ..utils import (
 )
 
 
-class HSEShowBaseInfoExtractor(InfoExtractor):
+class HSEShowBaseIE(InfoExtractor):
     _GEO_COUNTRIES = ['DE']
 
     def _extract_redux_data(self, url, video_id):
@@ -28,7 +28,7 @@ class HSEShowBaseInfoExtractor(InfoExtractor):
         return formats, subtitles
 
 
-class HSEShowIE(HSEShowBaseInfoExtractor):
+class HSEShowIE(HSEShowBaseIE):
     _VALID_URL = r'https?://(?:www\.)?hse\.de/dpl/c/tv-shows/(?P<id>[0-9]+)'
     _TESTS = [{
         'url': 'https://www.hse.de/dpl/c/tv-shows/505350',
@@ -64,7 +64,7 @@ class HSEShowIE(HSEShowBaseInfoExtractor):
         }
 
 
-class HSEProductIE(HSEShowBaseInfoExtractor):
+class HSEProductIE(HSEShowBaseIE):
     _VALID_URL = r'https?://(?:www\.)?hse\.de/dpl/p/product/(?P<id>[0-9]+)'
     _TESTS = [{
         'url': 'https://www.hse.de/dpl/p/product/408630',

yt_dlp/extractor/moviepilot.py

@@ -3,8 +3,8 @@ from .dailymotion import DailymotionIE
 
 
 class MoviepilotIE(InfoExtractor):
-    _IE_NAME = 'moviepilot'
-    _IE_DESC = 'Moviepilot trailer'
+    IE_NAME = 'moviepilot'
+    IE_DESC = 'Moviepilot trailer'
     _VALID_URL = r'https?://(?:www\.)?moviepilot\.de/movies/(?P<id>[^/]+)'
 
     _TESTS = [{

yt_dlp/extractor/polskieradio.py

@@ -22,7 +22,7 @@ from ..utils import (
 )
 
 
-class PolskieRadioBaseExtractor(InfoExtractor):
+class PolskieRadioBaseIE(InfoExtractor):
     def _extract_webpage_player_entries(self, webpage, playlist_id, base_data):
         media_urls = set()
 
@@ -47,7 +47,7 @@ class PolskieRadioBaseExtractor(InfoExtractor):
             yield entry
 
 
-class PolskieRadioLegacyIE(PolskieRadioBaseExtractor):
+class PolskieRadioLegacyIE(PolskieRadioBaseIE):
     # legacy sites
     IE_NAME = 'polskieradio:legacy'
     _VALID_URL = r'https?://(?:www\.)?polskieradio(?:24)?\.pl/\d+/\d+/[Aa]rtykul/(?P<id>\d+)'
@@ -127,7 +127,7 @@ class PolskieRadioLegacyIE(PolskieRadioBaseExtractor):
         return self.playlist_result(entries, playlist_id, title, description)
 
 
-class PolskieRadioIE(PolskieRadioBaseExtractor):
+class PolskieRadioIE(PolskieRadioBaseIE):
     # new next.js sites
     _VALID_URL = r'https?://(?:[^/]+\.)?(?:polskieradio(?:24)?|radiokierowcow)\.pl/artykul/(?P<id>\d+)'
     _TESTS = [{
@@ -519,7 +519,7 @@ class PolskieRadioPlayerIE(InfoExtractor):
         }
 
 
-class PolskieRadioPodcastBaseExtractor(InfoExtractor):
+class PolskieRadioPodcastBaseIE(InfoExtractor):
     _API_BASE = 'https://apipodcasts.polskieradio.pl/api'
 
     def _parse_episode(self, data):
@@ -539,7 +539,7 @@ class PolskieRadioPodcastBaseExtractor(InfoExtractor):
         }
 
 
-class PolskieRadioPodcastListIE(PolskieRadioPodcastBaseExtractor):
+class PolskieRadioPodcastListIE(PolskieRadioPodcastBaseIE):
     IE_NAME = 'polskieradio:podcast:list'
     _VALID_URL = r'https?://podcasty\.polskieradio\.pl/podcast/(?P<id>\d+)'
     _TESTS = [{
@@ -578,7 +578,7 @@ class PolskieRadioPodcastListIE(PolskieRadioPodcastBaseExtractor):
         }
 
 
-class PolskieRadioPodcastIE(PolskieRadioPodcastBaseExtractor):
+class PolskieRadioPodcastIE(PolskieRadioPodcastBaseIE):
     IE_NAME = 'polskieradio:podcast'
     _VALID_URL = r'https?://podcasty\.polskieradio\.pl/track/(?P<id>[a-f\d]{8}(?:-[a-f\d]{4}){4}[a-f\d]{8})'
     _TESTS = [{

yt_dlp/extractor/redgifs.py

@@ -12,7 +12,7 @@ from ..utils import (
 )
 
 
-class RedGifsBaseInfoExtractor(InfoExtractor):
+class RedGifsBaseIE(InfoExtractor):
     _FORMATS = {
         'gif': 250,
         'sd': 480,
@@ -113,7 +113,7 @@ class RedGifsBaseInfoExtractor(InfoExtractor):
         return page_fetcher(page) if page else OnDemandPagedList(page_fetcher, self._PAGE_SIZE)
 
 
-class RedGifsIE(RedGifsBaseInfoExtractor):
+class RedGifsIE(RedGifsBaseIE):
     _VALID_URL = r'https?://(?:(?:www\.)?redgifs\.com/(?:watch|ifr)/|thumbs2\.redgifs\.com/)(?P<id>[^-/?#\.]+)'
     _TESTS = [{
         'url': 'https://www.redgifs.com/watch/squeakyhelplesswisent',
@@ -172,7 +172,7 @@ class RedGifsIE(RedGifsBaseInfoExtractor):
         return self._parse_gif_data(video_info['gif'])
 
 
-class RedGifsSearchIE(RedGifsBaseInfoExtractor):
+class RedGifsSearchIE(RedGifsBaseIE):
     IE_DESC = 'Redgifs search'
     _VALID_URL = r'https?://(?:www\.)?redgifs\.com/browse\?(?P<query>[^#]+)'
     _PAGE_SIZE = 80
@@ -226,7 +226,7 @@ class RedGifsSearchIE(RedGifsBaseInfoExtractor):
             entries, query_str, tags, f'RedGifs search for {tags}, ordered by {order}')
 
 
-class RedGifsUserIE(RedGifsBaseInfoExtractor):
+class RedGifsUserIE(RedGifsBaseIE):
     IE_DESC = 'Redgifs user'
     _VALID_URL = r'https?://(?:www\.)?redgifs\.com/users/(?P<username>[^/?#]+)(?:\?(?P<query>[^#]+))?'
     _PAGE_SIZE = 80

yt_dlp/extractor/senategov.py

@@ -13,7 +13,7 @@ from ..utils.traversal import traverse_obj
 
 
 class SenateISVPIE(InfoExtractor):
-    _IE_NAME = 'senate.gov:isvp'
+    IE_NAME = 'senate.gov:isvp'
     _VALID_URL = r'https?://(?:www\.)?senate\.gov/isvp/?\?(?P<qs>.+)'
     _EMBED_REGEX = [r"<iframe[^>]+src=['\"](?P<url>https?://www\.senate\.gov/isvp/?\?[^'\"]+)['\"]"]
 
@@ -137,7 +137,7 @@ class SenateISVPIE(InfoExtractor):
 
 
 class SenateGovIE(InfoExtractor):
-    _IE_NAME = 'senate.gov'
+    IE_NAME = 'senate.gov'
     _SUBDOMAIN_RE = '|'.join(map(re.escape, (
         'agriculture', 'aging', 'appropriations', 'armed-services', 'banking',
         'budget', 'commerce', 'energy', 'epw', 'finance', 'foreign', 'help',

yt_dlp/extractor/taptap.py

@@ -191,12 +191,12 @@ class TapTapAppIE(TapTapBaseIE):
     }]
 
 
-class TapTapIntlBase(TapTapBaseIE):
+class TapTapIntlBaseIE(TapTapBaseIE):
     _X_UA = 'V=1&PN=WebAppIntl2&LANG=zh_TW&VN_CODE=115&VN=0.1.0&LOC=CN&PLT=PC&DS=Android&UID={uuid}&CURR=&DT=PC&OS=Windows&OSV=NT%208.0.0'
     _VIDEO_API = 'https://www.taptap.io/webapiv2/video-resource/v1/multi-get'
 
 
-class TapTapAppIntlIE(TapTapIntlBase):
+class TapTapAppIntlIE(TapTapIntlBaseIE):
     _VALID_URL = r'https?://www\.taptap\.io/app/(?P<id>\d+)'
     _INFO_API = 'https://www.taptap.io/webapiv2/i/app/v5/detail'
     _DATA_PATH = 'app'
@@ -227,7 +227,7 @@ class TapTapAppIntlIE(TapTapIntlBase):
     }]
 
 
-class TapTapPostIntlIE(TapTapIntlBase):
+class TapTapPostIntlIE(TapTapIntlBaseIE):
     _VALID_URL = r'https?://www\.taptap\.io/post/(?P<id>\d+)'
     _INFO_API = 'https://www.taptap.io/webapiv2/creation/post/v1/detail'
     _INFO_QUERY_KEY = 'id_str'

yt_dlp/extractor/wykop.py

@@ -11,7 +11,7 @@ from ..utils import (
 )
 
 
-class WykopBaseExtractor(InfoExtractor):
+class WykopBaseIE(InfoExtractor):
     def _get_token(self, force_refresh=False):
         if not force_refresh:
             maybe_cached = self.cache.load('wykop', 'bearer')
@@ -72,7 +72,7 @@ class WykopBaseExtractor(InfoExtractor):
         }
 
 
-class WykopDigIE(WykopBaseExtractor):
+class WykopDigIE(WykopBaseIE):
     IE_NAME = 'wykop:dig'
     _VALID_URL = r'https?://(?:www\.)?wykop\.pl/link/(?P<id>\d+)'
 
@@ -128,7 +128,7 @@ class WykopDigIE(WykopBaseExtractor):
         }
 
 
-class WykopDigCommentIE(WykopBaseExtractor):
+class WykopDigCommentIE(WykopBaseIE):
     IE_NAME = 'wykop:dig:comment'
     _VALID_URL = r'https?://(?:www\.)?wykop\.pl/link/(?P<dig_id>\d+)/[^/]+/komentarz/(?P<id>\d+)'
 
@@ -177,7 +177,7 @@ class WykopDigCommentIE(WykopBaseExtractor):
         }
 
 
-class WykopPostIE(WykopBaseExtractor):
+class WykopPostIE(WykopBaseIE):
     IE_NAME = 'wykop:post'
     _VALID_URL = r'https?://(?:www\.)?wykop\.pl/wpis/(?P<id>\d+)'
 
@@ -228,7 +228,7 @@ class WykopPostIE(WykopBaseExtractor):
         }
 
 
-class WykopPostCommentIE(WykopBaseExtractor):
+class WykopPostCommentIE(WykopBaseIE):
     IE_NAME = 'wykop:post:comment'
     _VALID_URL = r'https?://(?:www\.)?wykop\.pl/wpis/(?P<post_id>\d+)/[^/#]+#(?P<id>\d+)'
 

yt_dlp/extractor/youporn.py

@@ -227,7 +227,7 @@ class YouPornIE(InfoExtractor):
         return result
 
 
-class YouPornListBase(InfoExtractor):
+class YouPornListBaseIE(InfoExtractor):
     def _get_next_url(self, url, pl_id, html):
         return urljoin(url, self._search_regex(
             r'''<a [^>]*?\bhref\s*=\s*("|')(?P<url>(?:(?!\1)[^>])+)\1''',
@@ -284,7 +284,7 @@ class YouPornListBase(InfoExtractor):
             playlist_id=pl_id, playlist_title=title)
 
 
-class YouPornCategoryIE(YouPornListBase):
+class YouPornCategoryIE(YouPornListBaseIE):
     IE_DESC = 'YouPorn category, with sorting, filtering and pagination'
     _VALID_URL = r'''(?x)
         https?://(?:www\.)?youporn\.com/
@@ -319,7 +319,7 @@ class YouPornCategoryIE(YouPornListBase):
     }]
 
 
-class YouPornChannelIE(YouPornListBase):
+class YouPornChannelIE(YouPornListBaseIE):
     IE_DESC = 'YouPorn channel, with sorting and pagination'
     _VALID_URL = r'''(?x)
         https?://(?:www\.)?youporn\.com/
@@ -349,7 +349,7 @@ class YouPornChannelIE(YouPornListBase):
         return re.sub(r'_', ' ', title_slug).title()
 
 
-class YouPornCollectionIE(YouPornListBase):
+class YouPornCollectionIE(YouPornListBaseIE):
     IE_DESC = 'YouPorn collection (user playlist), with sorting and pagination'
     _VALID_URL = r'''(?x)
         https?://(?:www\.)?youporn\.com/
@@ -394,7 +394,7 @@ class YouPornCollectionIE(YouPornListBase):
         return playlist
 
 
-class YouPornTagIE(YouPornListBase):
+class YouPornTagIE(YouPornListBaseIE):
     IE_DESC = 'YouPorn tag (porntags), with sorting, filtering and pagination'
     _VALID_URL = r'''(?x)
         https?://(?:www\.)?youporn\.com/
@@ -442,7 +442,7 @@ class YouPornTagIE(YouPornListBase):
         return super()._real_extract(url)
 
 
-class YouPornStarIE(YouPornListBase):
+class YouPornStarIE(YouPornListBaseIE):
     IE_DESC = 'YouPorn Pornstar, with description, sorting and pagination'
     _VALID_URL = r'''(?x)
         https?://(?:www\.)?youporn\.com/
@@ -493,7 +493,7 @@ class YouPornStarIE(YouPornListBase):
         }
 
 
-class YouPornVideosIE(YouPornListBase):
+class YouPornVideosIE(YouPornListBaseIE):
     IE_DESC = 'YouPorn video (browse) playlists, with sorting, filtering and pagination'
     _VALID_URL = r'''(?x)
         https?://(?:www\.)?youporn\.com/

yt_dlp/extractor/youtube/_video.py

@@ -2199,7 +2199,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
 
     def _extract_n_function_code(self, video_id, player_url):
         player_id = self._extract_player_info(player_url)
-        func_code = self.cache.load('youtube-nsig', player_id, min_ver='2025.03.24')
+        func_code = self.cache.load('youtube-nsig', player_id, min_ver='2025.03.25')
         jscode = func_code or self._load_player(video_id, player_url)
         jsi = JSInterpreter(jscode)