Adapt changes from Andreas Tille for porting to Salsa.

[youtubedl] / youtube_dl / extractor / extractors.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 6a7028a4db9486608bd478e84978b563e0364736..b442256fee258b573fcc28e392c0d0ccb7a8ea1c 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -19,6 +19,7 @@ from .acast import (
     ACastChannelIE,
 )
 from .addanime import AddAnimeIE
     ACastChannelIE,
 )
 from .addanime import AddAnimeIE

+from .adn import ADNIE

 from .adobetv import (
     AdobeTVIE,
     AdobeTVShowIE,
 from .adobetv import (
     AdobeTVIE,
     AdobeTVShowIE,


@@ -30,19 +31,19 @@ from .aenetworks import (
     AENetworksIE,
     HistoryTopicIE,
 )
     AENetworksIE,
     HistoryTopicIE,
 )

-from .afreecatv import (
-    AfreecaTVIE,
-    AfreecaTVGlobalIE,
-)
+from .afreecatv import AfreecaTVIE

 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE
 from .alphaporno import AlphaPornoIE
 from .amcnetworks import AMCNetworksIE
 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE
 from .alphaporno import AlphaPornoIE
 from .amcnetworks import AMCNetworksIE

+from .americastestkitchen import AmericasTestKitchenIE

 from .animeondemand import AnimeOnDemandIE
 from .anitube import AnitubeIE
 from .animeondemand import AnimeOnDemandIE
 from .anitube import AnitubeIE

+from .anvato import AnvatoIE

 from .anysex import AnySexIE
 from .aol import AolIE
 from .allocine import AllocineIE
 from .anysex import AnySexIE
 from .aol import AolIE
 from .allocine import AllocineIE

+from .aliexpress import AliExpressLiveIE

 from .aparat import AparatIE
 from .appleconnect import AppleConnectIE
 from .appletrailers import (
 from .aparat import AparatIE
 from .appleconnect import AppleConnectIE
 from .appletrailers import (


@@ -69,6 +70,10 @@ from .arte import (
     TheOperaPlatformIE,
     ArteTVPlaylistIE,
 )
     TheOperaPlatformIE,
     ArteTVPlaylistIE,
 )

+from .asiancrush import (
+    AsianCrushIE,
+    AsianCrushPlaylistIE,
+)

 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE
 from .atvat import ATVAtIE
 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE
 from .atvat import ATVAtIE


@@ -86,10 +91,9 @@ from .azmedien import (
     AZMedienPlaylistIE,
     AZMedienShowPlaylistIE,
 )
     AZMedienPlaylistIE,
     AZMedienShowPlaylistIE,
 )

-from .azubu import AzubuIE, AzubuLiveIE

 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE

-from .bandcamp import BandcampIE, BandcampAlbumIE
+from .bandcamp import BandcampIE, BandcampAlbumIE, BandcampWeeklyIE

 from .bbc import (
     BBCCoUkIE,
     BBCCoUkArticleIE,
 from .bbc import (
     BBCCoUkIE,
     BBCCoUkArticleIE,


@@ -97,7 +101,10 @@ from .bbc import (
     BBCCoUkPlaylistIE,
     BBCIE,
 )
     BBCCoUkPlaylistIE,
     BBCIE,
 )

-from .beampro import BeamProLiveIE
+from .beampro import (
+    BeamProLiveIE,
+    BeamProVodIE,
+)

 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .bellmedia import BellMediaIE
 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .bellmedia import BellMediaIE


@@ -120,7 +127,10 @@ from .bloomberg import BloombergIE
 from .bokecc import BokeCCIE
 from .bostonglobe import BostonGlobeIE
 from .bpb import BpbIE
 from .bokecc import BokeCCIE
 from .bostonglobe import BostonGlobeIE
 from .bpb import BpbIE

-from .br import BRIE
+from .br import (
+    BRIE,
+    BRMediathekIE,
+)

 from .bravotv import BravoTVIE
 from .breakcom import BreakIE
 from .brightcove import (
 from .bravotv import BravoTVIE
 from .breakcom import BreakIE
 from .brightcove import (


@@ -128,10 +138,7 @@ from .brightcove import (
     BrightcoveNewIE,
 )
 from .buzzfeed import BuzzFeedIE
     BrightcoveNewIE,
 )
 from .buzzfeed import BuzzFeedIE

-from .byutv import (
-    BYUtvIE,
-    BYUtvEventIE,
-)
+from .byutv import BYUtvIE

 from .c56 import C56IE
 from .camdemy import (
     CamdemyIE,
 from .c56 import C56IE
 from .camdemy import (
     CamdemyIE,


@@ -140,7 +147,11 @@ from .camdemy import (
 from .camwithher import CamWithHerIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .camwithher import CamWithHerIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE

-from .canvas import CanvasIE
+from .canvas import (
+    CanvasIE,
+    CanvasEenIE,
+    VrtNUIE,
+)

 from .carambatv import (
     CarambaTVIE,
     CarambaTVPageIE,
 from .carambatv import (
     CarambaTVIE,
     CarambaTVPageIE,


@@ -164,7 +175,10 @@ from .ccc import CCCIE
 from .ccma import CCMAIE
 from .cctv import CCTVIE
 from .cda import CDAIE
 from .ccma import CCMAIE
 from .cctv import CCTVIE
 from .cda import CDAIE

-from .ceskatelevize import CeskaTelevizeIE
+from .ceskatelevize import (
+    CeskaTelevizeIE,
+    CeskaTelevizePoradyIE,
+)

 from .channel9 import Channel9IE
 from .charlierose import CharlieRoseIE
 from .chaturbate import ChaturbateIE
 from .channel9 import Channel9IE
 from .charlierose import CharlieRoseIE
 from .chaturbate import ChaturbateIE


@@ -174,8 +188,9 @@ from .chirbit import (
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE

-from .clipfish import ClipfishIE
+from .cjsw import CJSWIE

 from .cliphunter import CliphunterIE
 from .cliphunter import CliphunterIE

+from .clippit import ClippitIE

 from .cliprs import ClipRsIE
 from .clipsyndicate import ClipsyndicateIE
 from .closertotruth import CloserToTruthIE
 from .cliprs import ClipRsIE
 from .clipsyndicate import ClipsyndicateIE
 from .closertotruth import CloserToTruthIE


@@ -190,7 +205,6 @@ from .cnn import (
     CNNArticleIE,
 )
 from .coub import CoubIE
     CNNArticleIE,
 )
 from .coub import CoubIE

-from .collegerama import CollegeRamaIE

 from .comedycentral import (
     ComedyCentralFullEpisodesIE,
     ComedyCentralIE,
 from .comedycentral import (
     ComedyCentralFullEpisodesIE,
     ComedyCentralIE,


@@ -228,11 +242,10 @@ from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,
     DailymotionUserIE,
     DailymotionIE,
     DailymotionPlaylistIE,
     DailymotionUserIE,

-    DailymotionCloudIE,

 )
 from .daisuki import (
 )
 from .daisuki import (

-    DaisukiIE,
-    DaisukiPlaylistIE,
+    DaisukiMottoIE,
+    DaisukiMottoPlaylistIE,

 )
 from .daum import (
     DaumIE,
 )
 from .daum import (
     DaumIE,


@@ -246,8 +259,12 @@ from .deezer import DeezerPlaylistIE
 from .democracynow import DemocracynowIE
 from .dfb import DFBIE
 from .dhm import DHMIE
 from .democracynow import DemocracynowIE
 from .dfb import DFBIE
 from .dhm import DHMIE

+from .digg import DiggIE

 from .dotsub import DotsubIE
 from .dotsub import DotsubIE

-from .douyutv import DouyuTVIE
+from .douyutv import (
+    DouyuShowIE,
+    DouyuTVIE,
+)

 from .dplay import (
     DPlayIE,
     DPlayItIE,
 from .dplay import (
     DPlayIE,
     DPlayItIE,


@@ -272,6 +289,7 @@ from .discoverygo import (
     DiscoveryGoPlaylistIE,
 )
 from .discoverynetworks import DiscoveryNetworksDeIE
     DiscoveryGoPlaylistIE,
 )
 from .discoverynetworks import DiscoveryNetworksDeIE

+from .discoveryvr import DiscoveryVRIE

 from .disney import DisneyIE
 from .dispeak import DigitallySpeakingIE
 from .dropbox import DropboxIE
 from .disney import DisneyIE
 from .dispeak import DigitallySpeakingIE
 from .dropbox import DropboxIE


@@ -282,14 +300,18 @@ from .dw import (
 from .eagleplatform import EaglePlatformIE
 from .ebaumsworld import EbaumsWorldIE
 from .echomsk import EchoMskIE
 from .eagleplatform import EaglePlatformIE
 from .ebaumsworld import EbaumsWorldIE
 from .echomsk import EchoMskIE

-from .egghead import EggheadCourseIE
+from .egghead import (
+    EggheadCourseIE,
+    EggheadLessonIE,
+)

 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .einthusan import EinthusanIE
 from .eitb import EitbIE
 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .einthusan import EinthusanIE
 from .eitb import EitbIE

-from .ellentv import (
-    EllenTVIE,
-    EllenTVClipsIE,
+from .ellentube import (
+    EllenTubeIE,
+    EllenTubeVideoIE,
+    EllenTubePlaylistIE,

 )
 from .elpais import ElPaisIE
 from .embedly import EmbedlyIE
 )
 from .elpais import ElPaisIE
 from .embedly import EmbedlyIE


@@ -300,6 +322,7 @@ from .escapist import EscapistIE
 from .espn import (
     ESPNIE,
     ESPNArticleIE,
 from .espn import (
     ESPNIE,
     ESPNArticleIE,

+    FiveThirtyEightIE,

 )
 from .esri import EsriVideoIE
 from .etonline import ETOnlineIE
 )
 from .esri import EsriVideoIE
 from .etonline import ETOnlineIE


@@ -322,17 +345,21 @@ from .filmon import (
     FilmOnIE,
     FilmOnChannelIE,
 )
     FilmOnIE,
     FilmOnChannelIE,
 )

-from .firstpost import FirstpostIE
+from .filmweb import FilmwebIE

 from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE
 from .fivetv import FiveTVIE
 from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE
 from .fivetv import FiveTVIE

-from .fktv import FKTVIE

 from .flickr import FlickrIE
 from .flipagram import FlipagramIE
 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .formula1 import Formula1IE
 from .flickr import FlickrIE
 from .flipagram import FlipagramIE
 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .formula1 import Formula1IE

-from .fourtube import FourTubeIE
+from .fourtube import (
+    FourTubeIE,
+    PornTubeIE,
+    PornerBrosIE,
+    FuxIE,
+)

 from .fox import FOXIE
 from .fox9 import FOX9IE
 from .foxgay import FoxgayIE
 from .fox import FOXIE
 from .fox9 import FOX9IE
 from .foxgay import FoxgayIE


@@ -345,16 +372,17 @@ from .foxsports import FoxSportsIE
 from .franceculture import FranceCultureIE
 from .franceinter import FranceInterIE
 from .francetv import (
 from .franceculture import FranceCultureIE
 from .franceinter import FranceInterIE
 from .francetv import (

-    PluzzIE,
-    FranceTvInfoIE,

     FranceTVIE,
     FranceTVIE,

-    GenerationQuoiIE,
+    FranceTVEmbedIE,
+    FranceTVInfoIE,
+    GenerationWhatIE,

     CultureboxIE,
 )
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 from .freshlive import FreshLiveIE
 from .funimation import FunimationIE
     CultureboxIE,
 )
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 from .freshlive import FreshLiveIE
 from .funimation import FunimationIE

+from .funk import FunkIE

 from .funnyordie import FunnyOrDieIE
 from .fusion import FusionIE
 from .fxnetworks import FXNetworksIE
 from .funnyordie import FunnyOrDieIE
 from .fusion import FusionIE
 from .fxnetworks import FXNetworksIE


@@ -363,7 +391,6 @@ from .gameone import (
     GameOneIE,
     GameOnePlaylistIE,
 )
     GameOneIE,
     GameOnePlaylistIE,
 )

-from .gamersyde import GamersydeIE

 from .gamespot import GameSpotIE
 from .gamestar import GameStarIE
 from .gaskrank import GaskrankIE
 from .gamespot import GameSpotIE
 from .gamestar import GameStarIE
 from .gaskrank import GaskrankIE


@@ -379,8 +406,8 @@ from .globo import (
     GloboArticleIE,
 )
 from .go import GoIE
     GloboArticleIE,
 )
 from .go import GoIE

+from .go90 import Go90IE

 from .godtube import GodTubeIE
 from .godtube import GodTubeIE

-from .godtv import GodTVIE

 from .golem import GolemIE
 from .googledrive import GoogleDriveIE
 from .googleplus import GooglePlusIE
 from .golem import GolemIE
 from .googledrive import GoogleDriveIE
 from .googleplus import GooglePlusIE


@@ -404,7 +431,10 @@ from .hitbox import HitboxIE, HitboxLiveIE
 from .hitrecord import HitRecordIE
 from .hornbunny import HornBunnyIE
 from .hotnewhiphop import HotNewHipHopIE
 from .hitrecord import HitRecordIE
 from .hornbunny import HornBunnyIE
 from .hotnewhiphop import HotNewHipHopIE

-from .hotstar import HotStarIE
+from .hotstar import (
+    HotStarIE,
+    HotStarPlaylistIE,
+)

 from .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE
 from .hrti import (
 from .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE
 from .hrti import (


@@ -436,6 +466,7 @@ from .indavideo import (
 )
 from .infoq import InfoQIE
 from .instagram import InstagramIE, InstagramUserIE
 )
 from .infoq import InfoQIE
 from .instagram import InstagramIE, InstagramUserIE

+from .internazionale import InternazionaleIE

 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE
 from .iqiyi import IqiyiIE
 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE
 from .iqiyi import IqiyiIE


@@ -454,10 +485,11 @@ from .jamendo import (
 )
 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 )
 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE

+from .joj import JojIE

 from .jwplatform import JWPlatformIE
 from .jpopsukitv import JpopsukiIE
 from .jwplatform import JWPlatformIE
 from .jpopsukitv import JpopsukiIE

+from .kakao import KakaoIE

 from .kaltura import KalturaIE
 from .kaltura import KalturaIE

-from .kamcord import KamcordIE

 from .kanalplay import KanalPlayIE
 from .kankan import KankanIE
 from .karaoketv import KaraoketvIE
 from .kanalplay import KanalPlayIE
 from .kankan import KankanIE
 from .karaoketv import KaraoketvIE


@@ -484,6 +516,7 @@ from .la7 import LA7IE
 from .laola1tv import (
     Laola1TvEmbedIE,
     Laola1TvIE,
 from .laola1tv import (
     Laola1TvEmbedIE,
     Laola1TvIE,

+    ITTFIE,

 )
 from .lci import LCIIE
 from .lcp import (
 )
 from .lci import LCIIE
 from .lcp import (


@@ -511,7 +544,10 @@ from .limelight import (
     LimelightChannelListIE,
 )
 from .litv import LiTVIE
     LimelightChannelListIE,
 )
 from .litv import LiTVIE

-from .liveleak import LiveLeakIE
+from .liveleak import (
+    LiveLeakIE,
+    LiveLeakEmbedIE,
+)

 from .livestream import (
     LivestreamIE,
     LivestreamOriginalIE,
 from .livestream import (
     LivestreamIE,
     LivestreamOriginalIE,


@@ -534,8 +570,14 @@ from .mangomolo import (
     MangomoloVideoIE,
     MangomoloLiveIE,
 )
     MangomoloVideoIE,
     MangomoloLiveIE,
 )

+from .manyvids import ManyVidsIE
+from .massengeschmacktv import MassengeschmackTVIE

 from .matchtv import MatchTVIE
 from .mdr import MDRIE
 from .matchtv import MatchTVIE
 from .mdr import MDRIE

+from .mediaset import MediasetIE
+from .mediasite import MediasiteIE
+from .medici import MediciIE
+from .megaphone import MegaphoneIE

 from .meipai import MeipaiIE
 from .melonvod import MelonVODIE
 from .meta import METAIE
 from .meipai import MeipaiIE
 from .melonvod import MelonVODIE
 from .meta import METAIE


@@ -562,13 +604,15 @@ from .mixcloud import (
 )
 from .mlb import MLBIE
 from .mnet import MnetIE
 )
 from .mlb import MLBIE
 from .mnet import MnetIE

-from .mpora import MporaIE

 from .moevideo import MoeVideoIE
 from .mofosex import MofosexIE
 from .mojvideo import MojvideoIE
 from .moniker import MonikerIE
 from .morningstar import MorningstarIE
 from .moevideo import MoeVideoIE
 from .mofosex import MofosexIE
 from .mojvideo import MojvideoIE
 from .moniker import MonikerIE
 from .morningstar import MorningstarIE

-from .motherless import MotherlessIE
+from .motherless import (
+    MotherlessIE,
+    MotherlessGroupIE
+)

 from .motorsport import MotorsportIE
 from .movieclips import MovieClipsIE
 from .moviezine import MoviezineIE
 from .motorsport import MotorsportIE
 from .movieclips import MovieClipsIE
 from .moviezine import MoviezineIE


@@ -587,7 +631,6 @@ from .mwave import MwaveIE, MwaveMeetGreetIE
 from .myspace import MySpaceIE, MySpaceAlbumIE
 from .myspass import MySpassIE
 from .myvi import MyviIE
 from .myspace import MySpaceIE, MySpaceAlbumIE
 from .myspass import MySpassIE
 from .myvi import MyviIE

-from .myvideo import MyVideoIE

 from .myvidster import MyVidsterIE
 from .nationalgeographic import (
     NationalGeographicVideoIE,
 from .myvidster import MyVidsterIE
 from .nationalgeographic import (
     NationalGeographicVideoIE,


@@ -623,7 +666,10 @@ from .neteasemusic import (
     NetEaseMusicProgramIE,
     NetEaseMusicDjRadioIE,
 )
     NetEaseMusicProgramIE,
     NetEaseMusicDjRadioIE,
 )

-from .newgrounds import NewgroundsIE
+from .newgrounds import (
+    NewgroundsIE,
+    NewgroundsPlaylistIE,
+)

 from .newstube import NewstubeIE
 from .nextmedia import (
     NextMediaIE,
 from .newstube import NewstubeIE
 from .nextmedia import (
     NextMediaIE,


@@ -631,6 +677,10 @@ from .nextmedia import (
     AppleDailyIE,
     NextTVIE,
 )
     AppleDailyIE,
     NextTVIE,
 )

+from .nexx import (
+    NexxIE,
+    NexxEmbedIE,
+)

 from .nfb import NFBIE
 from .nfl import NFLIE
 from .nhk import NhkVodIE
 from .nfb import NFBIE
 from .nfl import NFLIE
 from .nhk import NhkVodIE


@@ -642,8 +692,10 @@ from .nhl import (
 )
 from .nick import (
     NickIE,
 )
 from .nick import (
     NickIE,

+    NickBrIE,

     NickDeIE,
     NickNightIE,
     NickDeIE,
     NickNightIE,

+    NickRuIE,

 )
 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninecninemedia import (
 )
 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninecninemedia import (


@@ -656,6 +708,8 @@ from .nintendo import NintendoIE
 from .njpwworld import NJPWWorldIE
 from .nobelprize import NobelPrizeIE
 from .noco import NocoIE
 from .njpwworld import NJPWWorldIE
 from .nobelprize import NobelPrizeIE
 from .noco import NocoIE

+from .nonktube import NonkTubeIE
+from .noovo import NoovoIE

 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE
 from .nova import NovaIE
 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE
 from .nova import NovaIE


@@ -671,10 +725,6 @@ from .nowness import (
     NownessPlaylistIE,
     NownessSeriesIE,
 )
     NownessPlaylistIE,
     NownessSeriesIE,
 )

-from .nowtv import (
-    NowTVIE,
-    NowTVListIE,
-)

 from .noz import NozIE
 from .npo import (
     AndereTijdenIE,
 from .noz import NozIE
 from .npo import (
     AndereTijdenIE,


@@ -724,16 +774,23 @@ from .openload import OpenloadIE
 from .ora import OraTVIE
 from .orf import (
     ORFTVthekIE,
 from .ora import OraTVIE
 from .orf import (
     ORFTVthekIE,

-    ORFOE1IE,

     ORFFM4IE,
     ORFFM4IE,

+    ORFFM4StoryIE,
+    ORFOE1IE,

     ORFIPTVIE,
 )
     ORFIPTVIE,
 )

+from .packtpub import (
+    PacktPubIE,
+    PacktPubCourseIE,
+)

 from .pandatv import PandaTVIE
 from .pandoratv import PandoraTVIE
 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE
 from .pandatv import PandaTVIE
 from .pandoratv import PandoraTVIE
 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE

+from .pearvideo import PearVideoIE

 from .people import PeopleIE
 from .people import PeopleIE

+from .performgroup import PerformGroupIE

 from .periscope import (
     PeriscopeIE,
     PeriscopeUserIE,
 from .periscope import (
     PeriscopeIE,
     PeriscopeUserIE,


@@ -759,6 +816,7 @@ from .polskieradio import (
     PolskieRadioIE,
     PolskieRadioCategoryIE,
 )
     PolskieRadioIE,
     PolskieRadioCategoryIE,
 )

+from .popcorntv import PopcornTVIE

 from .porn91 import Porn91IE
 from .porncom import PornComIE
 from .pornflip import PornFlipIE
 from .porn91 import Porn91IE
 from .porncom import PornComIE
 from .pornflip import PornFlipIE


@@ -797,12 +855,18 @@ from .radiojavan import RadioJavanIE
 from .radiobremen import RadioBremenIE
 from .radiofrance import RadioFranceIE
 from .rai import (
 from .radiobremen import RadioBremenIE
 from .radiofrance import RadioFranceIE
 from .rai import (

-    RaiTVIE,
+    RaiPlayIE,
+    RaiPlayLiveIE,
+    RaiPlayPlaylistIE,

     RaiIE,
 )
 from .rbmaradio import RBMARadioIE
 from .rds import RDSIE
 from .redbulltv import RedBullTVIE
     RaiIE,
 )
 from .rbmaradio import RBMARadioIE
 from .rds import RDSIE
 from .redbulltv import RedBullTVIE

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

 from .redtube import RedTubeIE
 from .regiotv import RegioTVIE
 from .rentv import (
 from .redtube import RedTubeIE
 from .regiotv import RegioTVIE
 from .rentv import (


@@ -817,7 +881,6 @@ from .revision3 import (
     Revision3IE,
 )
 from .rice import RICEIE
     Revision3IE,
 )
 from .rice import RICEIE

-from .ringtv import RingTVIE

 from .rmcdecouverte import RMCDecouverteIE
 from .ro220 import Ro220IE
 from .rockstargames import RockstarGamesIE
 from .rmcdecouverte import RMCDecouverteIE
 from .ro220 import Ro220IE
 from .rockstargames import RockstarGamesIE


@@ -828,11 +891,16 @@ from .rozhlas import RozhlasIE
 from .rtbf import RTBFIE
 from .rte import RteIE, RteRadioIE
 from .rtlnl import RtlNlIE
 from .rtbf import RTBFIE
 from .rte import RteIE, RteRadioIE
 from .rtlnl import RtlNlIE

-from .rtl2 import RTL2IE
+from .rtl2 import (
+    RTL2IE,
+    RTL2YouIE,
+    RTL2YouSeriesIE,
+)

 from .rtp import RTPIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE
 from .rtvnh import RTVNHIE
 from .rtp import RTPIE
 from .rts import RTSIE
 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 .ruleporn import RulePornIE
 from .rudo import RudoIE
 from .ruhd import RUHDIE
 from .ruleporn import RulePornIE


@@ -842,10 +910,11 @@ from .rutube import (
     RutubeEmbedIE,
     RutubeMovieIE,
     RutubePersonIE,
     RutubeEmbedIE,
     RutubeMovieIE,
     RutubePersonIE,

+    RutubePlaylistIE,

 )
 from .rutv import RUTVIE
 from .ruutu import RuutuIE
 )
 from .rutv import RUTVIE
 from .ruutu import RuutuIE

-from .sandia import SandiaIE
+from .ruv import RuvIE

 from .safari import (
     SafariIE,
     SafariApiIE,
 from .safari import (
     SafariIE,
     SafariApiIE,


@@ -861,8 +930,17 @@ from .seeker import SeekerIE
 from .senateisvp import SenateISVPIE
 from .sendtonews import SendtoNewsIE
 from .servingsys import ServingSysIE
 from .senateisvp import SenateISVPIE
 from .sendtonews import SendtoNewsIE
 from .servingsys import ServingSysIE

+from .servus import ServusIE
+from .sevenplus import SevenPlusIE

 from .sexu import SexuIE
 from .sexu import SexuIE

-from .shahid import ShahidIE
+from .seznamzpravy import (
+    SeznamZpravyIE,
+    SeznamZpravyArticleIE,
+)
+from .shahid import (
+    ShahidIE,
+    ShahidShowIE,
+)

 from .shared import (
     SharedIE,
     VivoIE,
 from .shared import (
     SharedIE,
     VivoIE,


@@ -877,6 +955,7 @@ from .skynewsarabia import (
 )
 from .skysports import SkySportsIE
 from .slideshare import SlideshareIE
 )
 from .skysports import SkySportsIE
 from .slideshare import SlideshareIE

+from .slideslive import SlidesLiveIE

 from .slutload import SlutloadIE
 from .smotri import (
     SmotriIE,
 from .slutload import SlutloadIE
 from .smotri import (
     SmotriIE,


@@ -891,8 +970,9 @@ from .soundcloud import (
     SoundcloudIE,
     SoundcloudSetIE,
     SoundcloudUserIE,
     SoundcloudIE,
     SoundcloudSetIE,
     SoundcloudUserIE,

+    SoundcloudTrackStationIE,

     SoundcloudPlaylistIE,
     SoundcloudPlaylistIE,

-    SoundcloudSearchIE
+    SoundcloudSearchIE,

 )
 from .soundgasm import (
     SoundgasmIE,
 )
 from .soundgasm import (
     SoundgasmIE,


@@ -914,7 +994,7 @@ from .stitcher import StitcherIE
 from .sport5 import Sport5IE
 from .sportbox import SportBoxEmbedIE
 from .sportdeutschland import SportDeutschlandIE
 from .sport5 import Sport5IE
 from .sportbox import SportBoxEmbedIE
 from .sportdeutschland import SportDeutschlandIE

-from .sportschau import SportschauIE
+from .springboardplatform import SpringboardPlatformIE

 from .sprout import SproutIE
 from .srgssr import (
     SRGSSRIE,
 from .sprout import SproutIE
 from .srgssr import (
     SRGSSRIE,


@@ -924,9 +1004,11 @@ from .srmediathek import SRMediathekIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamable import StreamableIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamable import StreamableIE

+from .streamango import StreamangoIE

 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 from .streetvoice import StreetVoiceIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 from .streetvoice import StreetVoiceIE

+from .stretchinternet import StretchInternetIE

 from .sunporno import SunPornoIE
 from .svt import (
     SVTIE,
 from .sunporno import SunPornoIE
 from .svt import (
     SVTIE,


@@ -940,6 +1022,7 @@ from .tagesschau import (
     TagesschauIE,
 )
 from .tass import TassIE
     TagesschauIE,
 )
 from .tass import TassIE

+from .tastytrade import TastyTradeIE

 from .tbs import TBSIE
 from .tdslifeway import TDSLifewayIE
 from .teachertube import (
 from .tbs import TBSIE
 from .tdslifeway import TDSLifewayIE
 from .teachertube import (


@@ -948,7 +1031,6 @@ from .teachertube import (
 )
 from .teachingchannel import TeachingChannelIE
 from .teamcoco import TeamcocoIE
 )
 from .teachingchannel import TeachingChannelIE
 from .teamcoco import TeamcocoIE

-from .teamfourstar import TeamFourStarIE

 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .tele13 import Tele13IE
 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .tele13 import Tele13IE


@@ -968,8 +1050,8 @@ from .theplatform import (
     ThePlatformFeedIE,
 )
 from .thescene import TheSceneIE
     ThePlatformFeedIE,
 )
 from .thescene import TheSceneIE

-from .thesixtyone import TheSixtyOneIE

 from .thestar import TheStarIE
 from .thestar import TheStarIE

+from .thesun import TheSunIE

 from .theweatherchannel import TheWeatherChannelIE
 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE
 from .theweatherchannel import TheWeatherChannelIE
 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE


@@ -996,11 +1078,6 @@ from .trilulilu import TriluliluIE
 from .trutv import TruTVIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE
 from .trutv import TruTVIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE

-from .tudou import (
-    TudouIE,
-    TudouPlaylistIE,
-    TudouAlbumIE,
-)

 from .tumblr import TumblrIE
 from .tunein import (
     TuneInClipIE,
 from .tumblr import TumblrIE
 from .tunein import (
     TuneInClipIE,


@@ -1016,8 +1093,10 @@ from .tv2 import (
     TV2IE,
     TV2ArticleIE,
 )
     TV2IE,
     TV2ArticleIE,
 )

+from .tv2hu import TV2HuIE

 from .tv3 import TV3IE
 from .tv4 import TV4IE
 from .tv3 import TV3IE
 from .tv4 import TV4IE

+from .tv5mondeplus import TV5MondePlusIE

 from .tva import TVAIE
 from .tvanouvelles import (
     TVANouvellesIE,
 from .tva import TVAIE
 from .tvanouvelles import (
     TVANouvellesIE,


@@ -1031,6 +1110,10 @@ from .tvigle import TvigleIE
 from .tvland import TVLandIE
 from .tvn24 import TVN24IE
 from .tvnoe import TVNoeIE
 from .tvland import TVLandIE
 from .tvn24 import TVN24IE
 from .tvnoe import TVNoeIE

+from .tvnow import (
+    TVNowIE,
+    TVNowListIE,
+)

 from .tvp import (
     TVPEmbedIE,
     TVPIE,
 from .tvp import (
     TVPEmbedIE,
     TVPIE,


@@ -1044,10 +1127,7 @@ from .tvplayer import TVPlayerIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE
 from .twentymin import TwentyMinutenIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE
 from .twentymin import TwentyMinutenIE

-from .twentytwotracks import (
-    TwentyTwoTracksIE,
-    TwentyTwoTracksGenreIE
-)
+from .twentythreevideo import TwentyThreeVideoIE

 from .twitch import (
     TwitchVideoIE,
     TwitchChapterIE,
 from .twitch import (
     TwitchVideoIE,
     TwitchChapterIE,


@@ -1070,14 +1150,21 @@ from .udemy import (
     UdemyCourseIE
 )
 from .udn import UDNEmbedIE
     UdemyCourseIE
 )
 from .udn import UDNEmbedIE

+from .ufctv import UFCTVIE

 from .uktvplay import UKTVPlayIE
 from .digiteka import DigitekaIE
 from .uktvplay import UKTVPlayIE
 from .digiteka import DigitekaIE

+from .umg import UMGDeIE

 from .unistra import UnistraIE
 from .unistra import UnistraIE

+from .unity import UnityIE

 from .uol import UOLIE
 from .uplynk import (
     UplynkIE,
     UplynkPreplayIE,
 )
 from .uol import UOLIE
 from .uplynk import (
     UplynkIE,
     UplynkPreplayIE,
 )

+from .upskill import (
+    UpskillIE,
+    UpskillCourseIE,
+)

 from .urort import UrortIE
 from .urplay import URPlayIE
 from .usanetwork import USANetworkIE
 from .urort import UrortIE
 from .urplay import URPlayIE
 from .usanetwork import USANetworkIE


@@ -1105,6 +1192,7 @@ from .vgtv import (
 from .vh1 import VH1IE
 from .vice import (
     ViceIE,
 from .vh1 import VH1IE
 from .vice import (
     ViceIE,

+    ViceArticleIE,

     ViceShowIE,
 )
 from .viceland import VicelandIE
     ViceShowIE,
 )
 from .viceland import VicelandIE


@@ -1167,16 +1255,26 @@ from .vk import (
 )
 from .vlive import (
     VLiveIE,
 )
 from .vlive import (
     VLiveIE,

-    VLiveChannelIE
+    VLiveChannelIE,
+    VLivePlaylistIE

 )
 from .vodlocker import VodlockerIE
 from .vodpl import VODPlIE
 from .vodplatform import VODPlatformIE
 from .voicerepublic import VoiceRepublicIE
 )
 from .vodlocker import VodlockerIE
 from .vodpl import VODPlIE
 from .vodplatform import VODPlatformIE
 from .voicerepublic import VoiceRepublicIE

-from .voxmedia import VoxMediaIE
+from .voot import VootIE
+from .voxmedia import (
+    VoxMediaVolumeIE,
+    VoxMediaIE,
+)

 from .vporn import VpornIE
 from .vrt import VRTIE
 from .vrak import VrakIE
 from .vporn import VpornIE
 from .vrt import VRTIE
 from .vrak import VrakIE

+from .vrv import (
+    VRVIE,
+    VRVSeriesIE,
+)
+from .vshare import VShareIE

 from .medialaan import MedialaanIE
 from .vube import VubeIE
 from .vuclip import VuClipIE
 from .medialaan import MedialaanIE
 from .vube import VubeIE
 from .vuclip import VuClipIE


@@ -1189,9 +1287,12 @@ from .washingtonpost import (
     WashingtonPostArticleIE,
 )
 from .wat import WatIE
     WashingtonPostArticleIE,
 )
 from .wat import WatIE

+from .watchbox import WatchBoxIE

 from .watchindianporn import WatchIndianPornIE
 from .wdr import (
     WDRIE,
 from .watchindianporn import WatchIndianPornIE
 from .wdr import (
     WDRIE,

+    WDRPageIE,
+    WDRElefantIE,

     WDRMobileIE,
 )
 from .webcaster import (
     WDRMobileIE,
 )
 from .webcaster import (


@@ -1202,6 +1303,10 @@ from .webofstories import (
     WebOfStoriesIE,
     WebOfStoriesPlaylistIE,
 )
     WebOfStoriesIE,
     WebOfStoriesPlaylistIE,
 )

+from .weibo import (
+    WeiboIE, 
+    WeiboMobileIE
+)

 from .weiqitv import WeiqiTVIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .weiqitv import WeiqiTVIE
 from .wimp import WimpIE
 from .wistia import WistiaIE


@@ -1210,7 +1315,10 @@ from .wrzuta import (
     WrzutaIE,
     WrzutaPlaylistIE,
 )
     WrzutaIE,
     WrzutaPlaylistIE,
 )

-from .wsj import WSJIE
+from .wsj import (
+    WSJIE,
+    WSJArticleIE,
+)

 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .xfileshare import XFileShareIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .xfileshare import XFileShareIE


@@ -1224,6 +1332,10 @@ from .xiami import (
     XiamiArtistIE,
     XiamiCollectionIE
 )
     XiamiArtistIE,
     XiamiCollectionIE
 )

+from .ximalaya import (
+    XimalayaIE,
+    XimalayaAlbumIE
+)

 from .xminus import XMinusIE
 from .xnxx import XNXXIE
 from .xstream import XstreamIE
 from .xminus import XMinusIE
 from .xnxx import XNXXIE
 from .xstream import XstreamIE


@@ -1235,12 +1347,12 @@ from .yahoo import (
     YahooIE,
     YahooSearchIE,
 )
     YahooIE,
     YahooSearchIE,
 )

-from .yam import YamIE

 from .yandexmusic import (
     YandexMusicTrackIE,
     YandexMusicAlbumIE,
     YandexMusicPlaylistIE,
 )
 from .yandexmusic import (
     YandexMusicTrackIE,
     YandexMusicAlbumIE,
     YandexMusicPlaylistIE,
 )

+from .yandexdisk import YandexDiskIE

 from .yesjapan import YesJapanIE
 from .yinyuetai import YinYueTaiIE
 from .ynet import YnetIE
 from .yesjapan import YesJapanIE
 from .yinyuetai import YinYueTaiIE
 from .ynet import YnetIE


@@ -1249,6 +1361,11 @@ from .youku import (
     YoukuIE,
     YoukuShowIE,
 )
     YoukuIE,
     YoukuShowIE,
 )

+from .younow import (
+    YouNowLiveIE,
+    YouNowChannelIE,
+    YouNowMomentIE,
+)

 from .youporn import YouPornIE
 from .yourupload import YourUploadIE
 from .youtube import (
 from .youporn import YouPornIE
 from .yourupload import YourUploadIE
 from .youtube import (


@@ -1263,7 +1380,6 @@ from .youtube import (
     YoutubeSearchDateIE,
     YoutubeSearchIE,
     YoutubeSearchURLIE,
     YoutubeSearchDateIE,
     YoutubeSearchIE,
     YoutubeSearchURLIE,

-    YoutubeSharedVideoIE,

     YoutubeShowIE,
     YoutubeSubscriptionsIE,
     YoutubeTruncatedIDIE,
     YoutubeShowIE,
     YoutubeSubscriptionsIE,
     YoutubeTruncatedIDIE,


@@ -1272,5 +1388,6 @@ from .youtube import (
     YoutubeWatchLaterIE,
 )
 from .zapiks import ZapiksIE
     YoutubeWatchLaterIE,
 )
 from .zapiks import ZapiksIE

+from .zaq1 import Zaq1IE

 from .zdf import ZDFIE, ZDFChannelIE
 from .zingmp3 import ZingMp3IE
 from .zdf import ZDFIE, ZDFChannelIE
 from .zingmp3 import ZingMp3IE