[youtube] Remove quality and tbr for itag 43 (closes #22372)

[youtube-dl] / youtube_dl / extractor / extractors.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 0e3ccb82d1b4b5d2225cf9db8fa0c76db448f797..4adcae1e5a240bc81f53e0ed63f1ae6ca19b9442 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -58,17 +58,8 @@ from .ard import (
     ARDMediathekIE,
 )
 from .arte import (
     ARDMediathekIE,
 )
 from .arte import (

-    ArteTvIE,

     ArteTVPlus7IE,
     ArteTVPlus7IE,

-    ArteTVCreativeIE,
-    ArteTVConcertIE,
-    ArteTVInfoIE,
-    ArteTVFutureIE,
-    ArteTVCinemaIE,
-    ArteTVDDCIE,
-    ArteTVMagazineIE,

     ArteTVEmbedIE,
     ArteTVEmbedIE,

-    TheOperaPlatformIE,

     ArteTVPlaylistIE,
 )
 from .asiancrush import (
     ArteTVPlaylistIE,
 )
 from .asiancrush import (


@@ -173,11 +164,15 @@ from .cbs import CBSIE
 from .cbslocal import CBSLocalIE
 from .cbsinteractive import CBSInteractiveIE
 from .cbsnews import (
 from .cbslocal import CBSLocalIE
 from .cbsinteractive import CBSInteractiveIE
 from .cbsnews import (

+    CBSNewsEmbedIE,

     CBSNewsIE,
     CBSNewsLiveVideoIE,
 )
 from .cbssports import CBSSportsIE
     CBSNewsIE,
     CBSNewsLiveVideoIE,
 )
 from .cbssports import CBSSportsIE

-from .ccc import CCCIE
+from .ccc import (
+    CCCIE,
+    CCCPlaylistIE,
+)

 from .ccma import CCMAIE
 from .cctv import CCTVIE
 from .cda import CDAIE
 from .ccma import CCMAIE
 from .cctv import CCTVIE
 from .cda import CDAIE


@@ -194,6 +189,7 @@ from .chirbit import (
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE

+from .cinemax import CinemaxIE

 from .ciscolive import (
     CiscoLiveSessionIE,
     CiscoLiveSearchIE,
 from .ciscolive import (
     CiscoLiveSessionIE,
     CiscoLiveSearchIE,


@@ -236,7 +232,6 @@ from .condenast import CondeNastIE
 from .corus import CorusIE
 from .cracked import CrackedIE
 from .crackle import CrackleIE
 from .corus import CorusIE
 from .cracked import CrackedIE
 from .crackle import CrackleIE

-from .criterion import CriterionIE

 from .crooksandliars import CrooksAndLiarsIE
 from .crunchyroll import (
     CrunchyrollIE,
 from .crooksandliars import CrooksAndLiarsIE
 from .crunchyroll import (
     CrunchyrollIE,


@@ -283,10 +278,6 @@ from .dplay import (
     DPlayIE,
     DPlayItIE,
 )
     DPlayIE,
     DPlayItIE,
 )

-from .dramafever import (
-    DramaFeverIE,
-    DramaFeverSeriesIE,
-)

 from .dreisat import DreiSatIE
 from .drbonanza import DRBonanzaIE
 from .drtuber import DrTuberIE
 from .dreisat import DreiSatIE
 from .drbonanza import DRBonanzaIE
 from .drtuber import DrTuberIE


@@ -404,11 +395,7 @@ from .frontendmasters import (
     FrontendMastersCourseIE
 )
 from .funimation import FunimationIE
     FrontendMastersCourseIE
 )
 from .funimation import FunimationIE

-from .funk import (
-    FunkMixIE,
-    FunkChannelIE,
-)
-from .funnyordie import FunnyOrDieIE
+from .funk import FunkIE

 from .fusion import FusionIE
 from .fxnetworks import FXNetworksIE
 from .gaia import GaiaIE
 from .fusion import FusionIE
 from .fxnetworks import FXNetworksIE
 from .gaia import GaiaIE


@@ -592,6 +579,7 @@ from .linkedin import (
 )
 from .linuxacademy import LinuxAcademyIE
 from .litv import LiTVIE
 )
 from .linuxacademy import LinuxAcademyIE
 from .litv import LiTVIE

+from .livejournal import LiveJournalIE

 from .liveleak import (
     LiveLeakIE,
     LiveLeakEmbedIE,
 from .liveleak import (
     LiveLeakIE,
     LiveLeakEmbedIE,


@@ -745,7 +733,6 @@ from .nexx import (
     NexxIE,
     NexxEmbedIE,
 )
     NexxIE,
     NexxEmbedIE,
 )

-from .nfb import NFBIE

 from .nfl import NFLIE
 from .nhk import NhkVodIE
 from .nhl import NHLIE
 from .nfl import NFLIE
 from .nhk import NhkVodIE
 from .nhl import NHLIE


@@ -772,13 +759,6 @@ from .nova import (
     NovaEmbedIE,
     NovaIE,
 )
     NovaEmbedIE,
     NovaIE,
 )

-from .novamov import (
-    AuroraVidIE,
-    CloudTimeIE,
-    NowVideoIE,
-    VideoWeedIE,
-    WholeCloudIE,
-)

 from .nowness import (
     NownessIE,
     NownessPlaylistIE,
 from .nowness import (
     NownessIE,
     NownessPlaylistIE,


@@ -833,7 +813,10 @@ from .ooyala import (
     OoyalaIE,
     OoyalaExternalIE,
 )
     OoyalaIE,
     OoyalaExternalIE,
 )

-from .openload import OpenloadIE
+from .openload import (
+    OpenloadIE,
+    VerystreamIE,
+)

 from .ora import OraTVIE
 from .orf import (
     ORFTVthekIE,
 from .ora import OraTVIE
 from .orf import (
     ORFTVthekIE,


@@ -893,12 +876,12 @@ from .polskieradio import (
 from .popcorntv import PopcornTVIE
 from .porn91 import Porn91IE
 from .porncom import PornComIE
 from .popcorntv import PopcornTVIE
 from .porn91 import Porn91IE
 from .porncom import PornComIE

-from .pornflip import PornFlipIE

 from .pornhd import PornHdIE
 from .pornhub import (
     PornHubIE,
 from .pornhd import PornHdIE
 from .pornhub import (
     PornHubIE,

-    PornHubPlaylistIE,
-    PornHubUserVideosIE,
+    PornHubUserIE,
+    PornHubPagedVideoListIE,
+    PornHubUserVideosUploadIE,

 )
 from .pornotube import PornotubeIE
 from .pornovoisines import PornoVoisinesIE
 )
 from .pornotube import PornotubeIE
 from .pornovoisines import PornoVoisinesIE


@@ -943,7 +926,10 @@ from .raywenderlich import (
 )
 from .rbmaradio import RBMARadioIE
 from .rds import RDSIE
 )
 from .rbmaradio import RBMARadioIE
 from .rds import RDSIE

-from .redbulltv import RedBullTVIE
+from .redbulltv import (
+    RedBullTVIE,
+    RedBullTVRrnContentIE,
+)

 from .reddit import (
     RedditIE,
     RedditRIE,
 from .reddit import (
     RedditIE,
     RedditRIE,


@@ -982,7 +968,6 @@ from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE
 from .rtvnh import RTVNHIE
 from .rtvs import RTVSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE
 from .rtvnh import RTVNHIE
 from .rtvs import RTVSIE

-from .rudo import RudoIE

 from .ruhd import RUHDIE
 from .rutube import (
     RutubeIE,
 from .ruhd import RUHDIE
 from .rutube import (
     RutubeIE,


@@ -1033,7 +1018,10 @@ from .skynewsarabia import (
     SkyNewsArabiaIE,
     SkyNewsArabiaArticleIE,
 )
     SkyNewsArabiaIE,
     SkyNewsArabiaArticleIE,
 )

-from .skysports import SkySportsIE
+from .sky import (
+    SkyNewsIE,
+    SkySportsIE,
+)

 from .slideshare import SlideshareIE
 from .slideslive import SlidesLiveIE
 from .slutload import SlutloadIE
 from .slideshare import SlideshareIE
 from .slideslive import SlidesLiveIE
 from .slutload import SlutloadIE


@@ -1097,6 +1085,10 @@ from .streetvoice import StreetVoiceIE
 from .stretchinternet import StretchInternetIE
 from .stv import STVPlayerIE
 from .sunporno import SunPornoIE
 from .stretchinternet import StretchInternetIE
 from .stv import STVPlayerIE
 from .sunporno import SunPornoIE

+from .sverigesradio import (
+    SverigesRadioEpisodeIE,
+    SverigesRadioPublicationIE,
+)

 from .svt import (
     SVTIE,
     SVTPageIE,
 from .svt import (
     SVTIE,
     SVTPageIE,


@@ -1263,6 +1255,10 @@ from .udn import UDNEmbedIE
 from .ufctv import UFCTVIE
 from .uktvplay import UKTVPlayIE
 from .digiteka import DigitekaIE
 from .ufctv import UFCTVIE
 from .uktvplay import UKTVPlayIE
 from .digiteka import DigitekaIE

+from .dlive import (
+    DLiveVODIE,
+    DLiveStreamIE,
+)

 from .umg import UMGDeIE
 from .unistra import UnistraIE
 from .unity import UnityIE
 from .umg import UMGDeIE
 from .unistra import UnistraIE
 from .unity import UnityIE


@@ -1418,10 +1414,6 @@ from .weiqitv import WeiqiTVIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE

-from .wrzuta import (
-    WrzutaIE,
-    WrzutaPlaylistIE,
-)

 from .wsj import (
     WSJIE,
     WSJArticleIE,
 from .wsj import (
     WSJIE,
     WSJArticleIE,


@@ -1433,6 +1425,7 @@ from .xfileshare import XFileShareIE
 from .xhamster import (
     XHamsterIE,
     XHamsterEmbedIE,
 from .xhamster import (
     XHamsterIE,
     XHamsterEmbedIE,

+    XHamsterUserIE,

 )
 from .xiami import (
     XiamiSongIE,
 )
 from .xiami import (
     XiamiSongIE,


@@ -1456,6 +1449,7 @@ from .yahoo import (
     YahooSearchIE,
     YahooGyaOPlayerIE,
     YahooGyaOIE,
     YahooSearchIE,
     YahooGyaOPlayerIE,
     YahooGyaOIE,

+    YahooJapanNewsIE,

 )
 from .yandexdisk import YandexDiskIE
 from .yandexmusic import (
 )
 from .yandexdisk import YandexDiskIE
 from .yandexmusic import (