Prepare to release.

[youtubedl] / youtube_dl / extractor / extractors.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index ecb33bc9e7dbbb673a87fc93036e75d06c6f6229..530474f3fc61282799a64d9c52589de3a0cc38a1 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -20,6 +20,7 @@ from .acast import (
 )
 from .addanime import AddAnimeIE
 from .adn import ADNIE
 )
 from .addanime import AddAnimeIE
 from .adn import ADNIE

+from .adobeconnect import AdobeConnectIE

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


@@ -38,12 +39,11 @@ from .alphaporno import AlphaPornoIE
 from .amcnetworks import AMCNetworksIE
 from .americastestkitchen import AmericasTestKitchenIE
 from .animeondemand import AnimeOnDemandIE
 from .amcnetworks import AMCNetworksIE
 from .americastestkitchen import AmericasTestKitchenIE
 from .animeondemand import AnimeOnDemandIE

-from .anitube import AnitubeIE

 from .anvato import AnvatoIE
 from .anvato import AnvatoIE

-from .anysex import AnySexIE

 from .aol import AolIE
 from .allocine import AllocineIE
 from .aliexpress import AliExpressLiveIE
 from .aol import AolIE
 from .allocine import AllocineIE
 from .aliexpress import AliExpressLiveIE

+from .apa import APAIE

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


@@ -53,6 +53,7 @@ from .appletrailers import (
 from .archiveorg import ArchiveOrgIE
 from .arkena import ArkenaIE
 from .ard import (
 from .archiveorg import ArchiveOrgIE
 from .arkena import ArkenaIE
 from .ard import (

+    ARDBetaMediathekIE,

     ARDIE,
     ARDMediathekIE,
 )
     ARDIE,
     ARDMediathekIE,
 )


@@ -86,11 +87,7 @@ from .awaan import (
     AWAANLiveIE,
     AWAANSeasonIE,
 )
     AWAANLiveIE,
     AWAANSeasonIE,
 )

-from .azmedien import (
-    AZMedienIE,
-    AZMedienPlaylistIE,
-    AZMedienShowPlaylistIE,
-)
+from .azmedien import AZMedienIE

 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE, BandcampWeeklyIE
 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE, BandcampWeeklyIE


@@ -110,6 +107,7 @@ from .behindkink import BehindKinkIE
 from .bellmedia import BellMediaIE
 from .beatport import BeatportIE
 from .bet import BetIE
 from .bellmedia import BellMediaIE
 from .beatport import BeatportIE
 from .bet import BetIE

+from .bfi import BFIPlayerIE

 from .bigflix import BigflixIE
 from .bild import BildIE
 from .bilibili import (
 from .bigflix import BigflixIE
 from .bild import BildIE
 from .bilibili import (


@@ -117,6 +115,10 @@ from .bilibili import (
     BiliBiliBangumiIE,
 )
 from .biobiochiletv import BioBioChileTVIE
     BiliBiliBangumiIE,
 )
 from .biobiochiletv import BioBioChileTVIE

+from .bitchute import (
+    BitChuteIE,
+    BitChuteChannelIE,
+)

 from .biqle import BIQLEIE
 from .bleacherreport import (
     BleacherReportIE,
 from .biqle import BIQLEIE
 from .bleacherreport import (
     BleacherReportIE,


@@ -127,29 +129,33 @@ 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 (
     BrightcoveLegacyIE,
     BrightcoveNewIE,
 )
 from .bravotv import BravoTVIE
 from .breakcom import BreakIE
 from .brightcove import (
     BrightcoveLegacyIE,
     BrightcoveNewIE,
 )

+from .businessinsider import BusinessInsiderIE

 from .buzzfeed import BuzzFeedIE
 from .buzzfeed import BuzzFeedIE

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

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

+from .cammodels import CamModelsIE
+from .camtube import CamTubeIE

 from .camwithher import CamWithHerIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .canvas import (
     CanvasIE,
     CanvasEenIE,
 from .camwithher import CamWithHerIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .canvas import (
     CanvasIE,
     CanvasEenIE,

+    VrtNUIE,

 )
 from .carambatv import (
     CarambaTVIE,
 )
 from .carambatv import (
     CarambaTVIE,


@@ -161,16 +167,21 @@ from .cbc import (
     CBCPlayerIE,
     CBCWatchVideoIE,
     CBCWatchIE,
     CBCPlayerIE,
     CBCWatchVideoIE,
     CBCWatchIE,

+    CBCOlympicsIE,

 )
 from .cbs import CBSIE
 from .cbslocal import CBSLocalIE
 from .cbsinteractive import CBSInteractiveIE
 from .cbsnews import (
 )
 from .cbs import CBSIE
 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


@@ -187,24 +198,32 @@ from .chirbit import (
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE

+from .cinemax import CinemaxIE
+from .ciscolive import (
+    CiscoLiveSessionIE,
+    CiscoLiveSearchIE,
+)

 from .cjsw import CJSWIE
 from .cliphunter import CliphunterIE
 from .clippit import ClippitIE
 from .cliprs import ClipRsIE
 from .clipsyndicate import ClipsyndicateIE
 from .closertotruth import CloserToTruthIE
 from .cjsw import CJSWIE
 from .cliphunter import CliphunterIE
 from .clippit import ClippitIE
 from .cliprs import ClipRsIE
 from .clipsyndicate import ClipsyndicateIE
 from .closertotruth import CloserToTruthIE

+from .cloudflarestream import CloudflareStreamIE

 from .cloudy import CloudyIE
 from .clubic import ClubicIE
 from .clyp import ClypIE
 from .cmt import CMTIE
 from .cloudy import CloudyIE
 from .clubic import ClubicIE
 from .clyp import ClypIE
 from .cmt import CMTIE

-from .cnbc import CNBCIE
+from .cnbc import (
+    CNBCIE,
+    CNBCVideoIE,
+)

 from .cnn import (
     CNNIE,
     CNNBlogsIE,
     CNNArticleIE,
 )
 from .coub import CoubIE
 from .cnn import (
     CNNIE,
     CNNBlogsIE,
     CNNArticleIE,
 )
 from .coub import CoubIE

-from .collegerama import CollegeRamaIE

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


@@ -222,7 +241,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,


@@ -242,11 +260,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,


@@ -260,6 +277,7 @@ 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 .douyutv import (
     DouyuShowIE,
 from .dotsub import DotsubIE
 from .douyutv import (
     DouyuShowIE,


@@ -269,10 +287,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


@@ -280,6 +294,7 @@ from .drtv import (
     DRTVIE,
     DRTVLiveIE,
 )
     DRTVIE,
     DRTVLiveIE,
 )

+from .dtube import DTubeIE

 from .dvtv import DVTVIE
 from .dumpert import DumpertIE
 from .defense import DefenseGouvFrIE
 from .dvtv import DVTVIE
 from .dumpert import DumpertIE
 from .defense import DefenseGouvFrIE


@@ -308,9 +323,10 @@ from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .einthusan import EinthusanIE
 from .eitb import EitbIE
 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


@@ -321,12 +337,13 @@ from .escapist import EscapistIE
 from .espn import (
     ESPNIE,
     ESPNArticleIE,
 from .espn import (
     ESPNIE,
     ESPNArticleIE,

+    FiveThirtyEightIE,

 )
 from .esri import EsriVideoIE
 )
 from .esri import EsriVideoIE

-from .etonline import ETOnlineIE

 from .europa import EuropaIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .expotv import ExpoTVIE
 from .europa import EuropaIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .expotv import ExpoTVIE

+from .expressen import ExpressenIE

 from .extremetube import ExtremeTubeIE
 from .eyedotv import EyedoTVIE
 from .facebook import (
 from .extremetube import ExtremeTubeIE
 from .eyedotv import EyedoTVIE
 from .facebook import (


@@ -343,11 +360,10 @@ 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 .flickr import FlickrIE
 from .flipagram import FlipagramIE
 from .folketinget import FolketingetIE


@@ -365,32 +381,42 @@ from .foxgay import FoxgayIE
 from .foxnews import (
     FoxNewsIE,
     FoxNewsArticleIE,
 from .foxnews import (
     FoxNewsIE,
     FoxNewsArticleIE,

-    FoxNewsInsiderIE,

 )
 from .foxsports import FoxSportsIE
 from .franceculture import FranceCultureIE
 from .franceinter import FranceInterIE
 from .francetv import (
     FranceTVIE,
 )
 from .foxsports import FoxSportsIE
 from .franceculture import FranceCultureIE
 from .franceinter import FranceInterIE
 from .francetv import (
     FranceTVIE,

+    FranceTVSiteIE,

     FranceTVEmbedIE,
     FranceTVInfoIE,
     FranceTVEmbedIE,
     FranceTVInfoIE,

-    GenerationQuoiIE,
+    FranceTVInfoSportIE,
+    FranceTVJeunesseIE,
+    GenerationWhatIE,

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

+from .frontendmasters import (
+    FrontendMastersIE,
+    FrontendMastersLessonIE,
+    FrontendMastersCourseIE
+)

 from .funimation import FunimationIE
 from .funimation import FunimationIE

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

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

+from .gaia import GaiaIE

 from .gameinformer import GameInformerIE
 from .gameone import (
     GameOneIE,
     GameOnePlaylistIE,
 )
 from .gameinformer import GameInformerIE
 from .gameone import (
     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


@@ -416,22 +442,24 @@ from .goshgay import GoshgayIE
 from .gputechconf import GPUTechConfIE
 from .groupon import GrouponIE
 from .hark import HarkIE
 from .gputechconf import GPUTechConfIE
 from .groupon import GrouponIE
 from .hark import HarkIE

-from .hbo import (
-    HBOIE,
-    HBOEpisodeIE,
-)
+from .hbo import HBOIE

 from .hearthisat import HearThisAtIE
 from .heise import HeiseIE
 from .hellporno import HellPornoIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .hgtv import HGTVComShowIE
 from .hearthisat import HearThisAtIE
 from .heise import HeiseIE
 from .hellporno import HellPornoIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .hgtv import HGTVComShowIE

+from .hketv import HKETVIE
+from .hidive import HiDiveIE

 from .historicfilms import HistoricFilmsIE
 from .hitbox import HitboxIE, HitboxLiveIE
 from .hitrecord import HitRecordIE
 from .hornbunny import HornBunnyIE
 from .hotnewhiphop import HotNewHipHopIE
 from .historicfilms import HistoricFilmsIE
 from .hitbox import HitboxIE, HitboxLiveIE
 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 (


@@ -440,6 +468,10 @@ from .hrti import (
 )
 from .huajiao import HuajiaoIE
 from .huffpost import HuffPostIE
 )
 from .huajiao import HuajiaoIE
 from .huffpost import HuffPostIE

+from .hungama import (
+    HungamaIE,
+    HungamaSongIE,
+)

 from .hypem import HypemIE
 from .iconosquare import IconosquareIE
 from .ign import (
 from .hypem import HypemIE
 from .iconosquare import IconosquareIE
 from .ign import (


@@ -454,20 +486,26 @@ from .imdb import (
 from .imgur import (
     ImgurIE,
     ImgurAlbumIE,
 from .imgur import (
     ImgurIE,
     ImgurAlbumIE,

+    ImgurGalleryIE,

 )
 from .ina import InaIE
 from .inc import IncIE
 )
 from .ina import InaIE
 from .inc import IncIE

-from .indavideo import (
-    IndavideoIE,
-    IndavideoEmbedIE,
-)
+from .indavideo import IndavideoEmbedIE

 from .infoq import InfoQIE
 from .infoq import InfoQIE

-from .instagram import InstagramIE, InstagramUserIE
+from .instagram import (
+    InstagramIE,
+    InstagramUserIE,
+    InstagramTagIE,
+)
+from .internazionale import InternazionaleIE

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

-from .itv import ITVIE
+from .itv import (
+    ITVIE,
+    ITVBTCCIE,
+)

 from .ivi import (
     IviIE,
     IviCompilationIE
 from .ivi import (
     IviIE,
     IviCompilationIE


@@ -486,7 +524,6 @@ from .jwplatform import JWPlatformIE
 from .jpopsukitv import JpopsukiIE
 from .kakao import KakaoIE
 from .kaltura import KalturaIE
 from .jpopsukitv import JpopsukiIE
 from .kakao import KakaoIE
 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


@@ -495,6 +532,7 @@ from .keezmovies import KeezMoviesIE
 from .ketnet import KetnetIE
 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .ketnet import KetnetIE
 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE

+from .kinopoisk import KinoPoiskIE

 from .keek import KeekIE
 from .konserthusetplay import KonserthusetPlayIE
 from .kontrtube import KontrTubeIE
 from .keek import KeekIE
 from .konserthusetplay import KonserthusetPlayIE
 from .kontrtube import KontrTubeIE


@@ -513,6 +551,7 @@ from .la7 import LA7IE
 from .laola1tv import (
     Laola1TvEmbedIE,
     Laola1TvIE,
 from .laola1tv import (
     Laola1TvEmbedIE,
     Laola1TvIE,

+    EHFTVIE,

     ITTFIE,
 )
 from .lci import LCIIE
     ITTFIE,
 )
 from .lci import LCIIE


@@ -522,13 +561,19 @@ from .lcp import (
 )
 from .learnr import LearnrIE
 from .lecture2go import Lecture2GoIE
 )
 from .learnr import LearnrIE
 from .lecture2go import Lecture2GoIE

-from .lego import LEGOIE
-from .lemonde import LemondeIE
+from .lecturio import (
+    LecturioIE,
+    LecturioCourseIE,
+    LecturioDeCourseIE,
+)

 from .leeco import (
     LeIE,
     LePlaylistIE,
     LetvCloudIE,
 )
 from .leeco import (
     LeIE,
     LePlaylistIE,
     LetvCloudIE,
 )

+from .lego import LEGOIE
+from .lemonde import LemondeIE
+from .lenta import LentaIE

 from .libraryofcongress import LibraryOfCongressIE
 from .libsyn import LibsynIE
 from .lifenews import (
 from .libraryofcongress import LibraryOfCongressIE
 from .libsyn import LibsynIE
 from .lifenews import (


@@ -540,6 +585,12 @@ from .limelight import (
     LimelightChannelIE,
     LimelightChannelListIE,
 )
     LimelightChannelIE,
     LimelightChannelListIE,
 )

+from .line import LineTVIE
+from .linkedin import (
+    LinkedInLearningIE,
+    LinkedInLearningCourseIE,
+)
+from .linuxacademy import LinuxAcademyIE

 from .litv import LiTVIE
 from .liveleak import (
     LiveLeakIE,
 from .litv import LiTVIE
 from .liveleak import (
     LiveLeakIE,


@@ -560,17 +611,31 @@ from .lynda import (
 )
 from .m6 import M6IE
 from .macgamestore import MacGameStoreIE
 )
 from .m6 import M6IE
 from .macgamestore import MacGameStoreIE

-from .mailru import MailRuIE
-from .makerschannel import MakersChannelIE
+from .mailru import (
+    MailRuIE,
+    MailRuMusicIE,
+    MailRuMusicSearchIE,
+)

 from .makertv import MakerTVIE
 from .makertv import MakerTVIE

+from .malltv import MallTVIE

 from .mangomolo import (
     MangomoloVideoIE,
     MangomoloLiveIE,
 )
 from .manyvids import ManyVidsIE
 from .mangomolo import (
     MangomoloVideoIE,
     MangomoloLiveIE,
 )
 from .manyvids import ManyVidsIE

+from .markiza import (
+    MarkizaIE,
+    MarkizaPageIE,
+)
+from .massengeschmacktv import MassengeschmackTVIE

 from .matchtv import MatchTVIE
 from .mdr import MDRIE
 from .mediaset import MediasetIE
 from .matchtv import MatchTVIE
 from .mdr import MDRIE
 from .mediaset import MediasetIE

+from .mediasite import (
+    MediasiteIE,
+    MediasiteCatalogIE,
+    MediasiteNamedCatalogIE,
+)

 from .medici import MediciIE
 from .megaphone import MegaphoneIE
 from .meipai import MeipaiIE
 from .medici import MediciIE
 from .megaphone import MegaphoneIE
 from .meipai import MeipaiIE


@@ -602,9 +667,11 @@ from .mnet import MnetIE
 from .moevideo import MoeVideoIE
 from .mofosex import MofosexIE
 from .mojvideo import MojvideoIE
 from .moevideo import MoeVideoIE
 from .mofosex import MofosexIE
 from .mojvideo import MojvideoIE

-from .moniker import MonikerIE

 from .morningstar import MorningstarIE
 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


@@ -620,15 +687,17 @@ from .mtv import (
 from .muenchentv import MuenchenTVIE
 from .musicplayon import MusicPlayOnIE
 from .mwave import MwaveIE, MwaveMeetGreetIE
 from .muenchentv import MuenchenTVIE
 from .musicplayon import MusicPlayOnIE
 from .mwave import MwaveIE, MwaveMeetGreetIE

+from .mychannels import MyChannelsIE

 from .myspace import MySpaceIE, MySpaceAlbumIE
 from .myspass import MySpassIE
 from .myspace import MySpaceIE, MySpaceAlbumIE
 from .myspass import MySpassIE

-from .myvi import MyviIE
-from .myvideo import MyVideoIE
+from .myvi import (
+    MyviIE,
+    MyviEmbedIE,
+)

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

-    NationalGeographicIE,
-    NationalGeographicEpisodeGuideIE,
+    NationalGeographicTVIE,

 )
 from .naver import NaverIE
 from .nba import NBAIE
 )
 from .naver import NaverIE
 from .nba import NBAIE


@@ -637,7 +706,9 @@ from .nbc import (
     NBCIE,
     NBCNewsIE,
     NBCOlympicsIE,
     NBCIE,
     NBCNewsIE,
     NBCOlympicsIE,

+    NBCOlympicsStreamIE,

     NBCSportsIE,
     NBCSportsIE,

+    NBCSportsStreamIE,

     NBCSportsVPlayerIE,
 )
 from .ndr import (
     NBCSportsVPlayerIE,
 )
 from .ndr import (


@@ -674,26 +745,18 @@ from .nexx import (
     NexxIE,
     NexxEmbedIE,
 )
     NexxIE,
     NexxEmbedIE,
 )

-from .nfb import NFBIE

 from .nfl import NFLIE
 from .nhk import NhkVodIE
 from .nfl import NFLIE
 from .nhk import NhkVodIE

-from .nhl import (
-    NHLVideocenterIE,
-    NHLNewsIE,
-    NHLVideocenterCategoryIE,
-    NHLIE,
-)
+from .nhl import NHLIE

 from .nick import (
     NickIE,
 from .nick import (
     NickIE,

+    NickBrIE,

     NickDeIE,
     NickNightIE,
     NickRuIE,
 )
 from .niconico import NiconicoIE, NiconicoPlaylistIE
     NickDeIE,
     NickNightIE,
     NickRuIE,
 )
 from .niconico import NiconicoIE, NiconicoPlaylistIE

-from .ninecninemedia import (
-    NineCNineMediaStackIE,
-    NineCNineMediaIE,
-)
+from .ninecninemedia import NineCNineMediaIE

 from .ninegag import NineGagIE
 from .ninenow import NineNowIE
 from .nintendo import NintendoIE
 from .ninegag import NineGagIE
 from .ninenow import NineNowIE
 from .nintendo import NintendoIE


@@ -704,23 +767,15 @@ from .nonktube import NonkTubeIE
 from .noovo import NoovoIE
 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE
 from .noovo import NoovoIE
 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE

-from .nova import NovaIE
-from .novamov import (
-    AuroraVidIE,
-    CloudTimeIE,
-    NowVideoIE,
-    VideoWeedIE,
-    WholeCloudIE,
+from .nova import (
+    NovaEmbedIE,
+    NovaIE,

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

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

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


@@ -740,9 +795,13 @@ from .nrk import (
     NRKSkoleIE,
     NRKTVIE,
     NRKTVDirekteIE,
     NRKSkoleIE,
     NRKTVIE,
     NRKTVDirekteIE,

+    NRKTVEpisodeIE,

     NRKTVEpisodesIE,
     NRKTVEpisodesIE,

+    NRKTVSeasonIE,

     NRKTVSeriesIE,
 )
     NRKTVSeriesIE,
 )

+from .nrl import NRLTVIE
+from .ntvcojp import NTVCoJpCUIE

 from .ntvde import NTVDeIE
 from .ntvru import NTVRuIE
 from .nytimes import (
 from .ntvde import NTVDeIE
 from .ntvru import NTVRuIE
 from .nytimes import (


@@ -766,7 +825,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,


@@ -775,6 +837,7 @@ from .orf import (
     ORFOE1IE,
     ORFIPTVIE,
 )
     ORFOE1IE,
     ORFIPTVIE,
 )

+from .outsidetv import OutsideTVIE

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


@@ -785,7 +848,9 @@ from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE
 from .pearvideo import PearVideoIE
 from .patreon import PatreonIE
 from .pbs import PBSIE
 from .pearvideo import PearVideoIE

+from .peertube import PeerTubeIE

 from .people import PeopleIE
 from .people import PeopleIE

+from .performgroup import PerformGroupIE

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


@@ -793,10 +858,19 @@ from .periscope import (
 from .philharmoniedeparis import PhilharmonieDeParisIE
 from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE
 from .philharmoniedeparis import PhilharmonieDeParisIE
 from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE

+from .picarto import (
+    PicartoIE,
+    PicartoVodIE,
+)

 from .piksel import PikselIE
 from .pinkbike import PinkbikeIE
 from .pladform import PladformIE
 from .piksel import PikselIE
 from .pinkbike import PinkbikeIE
 from .pladform import PladformIE

+from .platzi import (
+    PlatziIE,
+    PlatziCourseIE,
+)

 from .playfm import PlayFMIE
 from .playfm import PlayFMIE

+from .playplustv import PlayPlusTVIE

 from .plays import PlaysTVIE
 from .playtvak import PlaytvakIE
 from .playvid import PlayvidIE
 from .plays import PlaysTVIE
 from .playtvak import PlaytvakIE
 from .playvid import PlayvidIE


@@ -814,18 +888,21 @@ 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 .pornoxo import PornoXOIE
 )
 from .pornotube import PornotubeIE
 from .pornovoisines import PornoVoisinesIE
 from .pornoxo import PornoXOIE

+from .puhutv import (
+    PuhuTVIE,
+    PuhuTVSerieIE,
+)

 from .presstv import PressTVIE
 from .presstv import PressTVIE

-from .primesharetv import PrimeShareTVIE

 from .promptfile import PromptFileIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .puls4 import Puls4IE
 from .promptfile import PromptFileIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .puls4 import Puls4IE


@@ -852,11 +929,19 @@ from .radiofrance import RadioFranceIE
 from .rai import (
     RaiPlayIE,
     RaiPlayLiveIE,
 from .rai import (
     RaiPlayIE,
     RaiPlayLiveIE,

+    RaiPlayPlaylistIE,

     RaiIE,
 )
     RaiIE,
 )

+from .raywenderlich import (
+    RayWenderlichIE,
+    RayWenderlichCourseIE,
+)

 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,


@@ -875,7 +960,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


@@ -895,9 +979,9 @@ from .rtp import RTPIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE
 from .rtvnh import RTVNHIE
 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 .rudo import RudoIE
 from .ruhd import RUHDIE

-from .ruleporn import RulePornIE

 from .rutube import (
     RutubeIE,
     RutubeChannelIE,
 from .rutube import (
     RutubeIE,
     RutubeChannelIE,


@@ -909,7 +993,6 @@ from .rutube import (
 from .rutv import RUTVIE
 from .ruutu import RuutuIE
 from .ruv import RuvIE
 from .rutv import RUTVIE
 from .ruutu import RuutuIE
 from .ruv import RuvIE

-from .sandia import SandiaIE

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


@@ -925,8 +1008,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,


@@ -939,7 +1031,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


@@ -971,16 +1066,22 @@ from .southpark import (
     SouthParkEsIE,
     SouthParkNlIE
 )
     SouthParkEsIE,
     SouthParkNlIE
 )

-from .spankbang import SpankBangIE
+from .spankbang import (
+    SpankBangIE,
+    SpankBangPlaylistIE,
+)

 from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE, SpiegelArticleIE
 from .spiegeltv import SpiegeltvIE
 from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE, SpiegelArticleIE
 from .spiegeltv import SpiegeltvIE

-from .spike import SpikeIE
+from .spike import (
+    BellatorIE,
+    ParamountNetworkIE,
+)

 from .stitcher import StitcherIE
 from .sport5 import Sport5IE
 from .stitcher import StitcherIE
 from .sport5 import Sport5IE

-from .sportbox import SportBoxEmbedIE
+from .sportbox import SportBoxIE

 from .sportdeutschland import SportDeutschlandIE
 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,


@@ -994,10 +1095,18 @@ 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 .stv import STVPlayerIE

 from .sunporno import SunPornoIE
 from .sunporno import SunPornoIE

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

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

+    SVTPageIE,

     SVTPlayIE,
     SVTPlayIE,

+    SVTSeriesIE,

 )
 from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE
 )
 from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE


@@ -1010,22 +1119,33 @@ from .tass import TassIE
 from .tastytrade import TastyTradeIE
 from .tbs import TBSIE
 from .tdslifeway import TDSLifewayIE
 from .tastytrade import TastyTradeIE
 from .tbs import TBSIE
 from .tdslifeway import TDSLifewayIE

+from .teachable import (
+    TeachableIE,
+    TeachableCourseIE,
+)

 from .teachertube import (
     TeacherTubeIE,
     TeacherTubeUserIE,
 )
 from .teachingchannel import TeachingChannelIE
 from .teamcoco import TeamcocoIE
 from .teachertube import (
     TeacherTubeIE,
     TeacherTubeUserIE,
 )
 from .teachingchannel import TeachingChannelIE
 from .teamcoco import TeamcocoIE

+from .teamtreehouse import TeamTreeHouseIE

 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .techtalks import TechTalksIE
 from .ted import TEDIE

+from .tele5 import Tele5IE

 from .tele13 import Tele13IE
 from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE
 from .telegraaf import TelegraafIE
 from .telemb import TeleMBIE
 from .tele13 import Tele13IE
 from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE
 from .telegraaf import TelegraafIE
 from .telemb import TeleMBIE

-from .telequebec import TeleQuebecIE
+from .telequebec import (
+    TeleQuebecIE,
+    TeleQuebecEmissionIE,
+    TeleQuebecLiveIE,
+)

 from .teletask import TeleTaskIE
 from .telewebion import TelewebionIE
 from .teletask import TeleTaskIE
 from .telewebion import TelewebionIE

+from .tennistv import TennisTVIE

 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .tfo import TFOIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .tfo import TFOIE


@@ -1035,7 +1155,6 @@ from .theplatform import (
     ThePlatformFeedIE,
 )
 from .thescene import TheSceneIE
     ThePlatformFeedIE,
 )
 from .thescene import TheSceneIE

-from .thesixtyone import TheSixtyOneIE

 from .thestar import TheStarIE
 from .thesun import TheSunIE
 from .theweatherchannel import TheWeatherChannelIE
 from .thestar import TheStarIE
 from .thesun import TheSunIE
 from .theweatherchannel import TheWeatherChannelIE


@@ -1043,6 +1162,10 @@ from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE
 from .thisoldhouse import ThisOldHouseIE
 from .threeqsdn import ThreeQSDNIE
 from .thisav import ThisAVIE
 from .thisoldhouse import ThisOldHouseIE
 from .threeqsdn import ThreeQSDNIE

+from .tiktok import (
+    TikTokIE,
+    TikTokUserIE,
+)

 from .tinypic import TinyPicIE
 from .tmz import (
     TMZIE,
 from .tinypic import TinyPicIE
 from .tmz import (
     TMZIE,


@@ -1061,6 +1184,7 @@ from .toutv import TouTvIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE

+from .trunews import TruNewsIE

 from .trutv import TruTVIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE
 from .trutv import TruTVIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE


@@ -1080,7 +1204,6 @@ from .tv2 import (
     TV2ArticleIE,
 )
 from .tv2hu import TV2HuIE
     TV2ArticleIE,
 )
 from .tv2hu import TV2HuIE

-from .tv3 import TV3IE

 from .tv4 import TV4IE
 from .tv5mondeplus import TV5MondePlusIE
 from .tva import TVAIE
 from .tv4 import TV4IE
 from .tv5mondeplus import TV5MondePlusIE
 from .tva import TVAIE


@@ -1095,24 +1218,31 @@ from .tvc import (
 from .tvigle import TvigleIE
 from .tvland import TVLandIE
 from .tvn24 import TVN24IE
 from .tvigle import TvigleIE
 from .tvland import TVLandIE
 from .tvn24 import TVN24IE

+from .tvnet import TVNetIE

 from .tvnoe import TVNoeIE
 from .tvnoe import TVNoeIE

+from .tvnow import (
+    TVNowIE,
+    TVNowNewIE,
+    TVNowSeasonIE,
+    TVNowAnnualIE,
+    TVNowShowIE,
+)

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

-    TVPSeriesIE,
+    TVPWebsiteIE,

 )
 from .tvplay import (
     TVPlayIE,
     ViafreeIE,
 )
 from .tvplay import (
     TVPlayIE,
     ViafreeIE,

+    TVPlayHomeIE,

 )
 from .tvplayer import TVPlayerIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE
 from .twentymin import TwentyMinutenIE
 )
 from .tvplayer import TVPlayerIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE
 from .twentymin import TwentyMinutenIE

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

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


@@ -1135,18 +1265,17 @@ 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


@@ -1177,13 +1306,11 @@ from .vice import (
     ViceArticleIE,
     ViceShowIE,
 )
     ViceArticleIE,
     ViceShowIE,
 )

-from .viceland import VicelandIE

 from .vidbit import VidbitIE
 from .viddler import ViddlerIE
 from .videa import VideaIE
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
 from .vidbit import VidbitIE
 from .viddler import ViddlerIE
 from .videa import VideaIE
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE

-from .videomega import VideoMegaIE

 from .videomore import (
     VideomoreIE,
     VideomoreVideoIE,
 from .videomore import (
     VideomoreIE,
     VideomoreVideoIE,


@@ -1192,6 +1319,7 @@ from .videomore import (
 from .videopremium import VideoPremiumIE
 from .videopress import VideoPressIE
 from .vidio import VidioIE
 from .videopremium import VideoPremiumIE
 from .videopress import VideoPressIE
 from .vidio import VidioIE

+from .vidlii import VidLiiIE

 from .vidme import (
     VidmeIE,
     VidmeUserIE,
 from .vidme import (
     VidmeIE,
     VidmeUserIE,


@@ -1215,6 +1343,7 @@ from .vimeo import (
     VimeoReviewIE,
     VimeoUserIE,
     VimeoWatchLaterIE,
     VimeoReviewIE,
     VimeoUserIE,
     VimeoWatchLaterIE,

+    VHXEmbedIE,

 )
 from .vimple import VimpleIE
 from .vine import (
 )
 from .vimple import VimpleIE
 from .vine import (


@@ -1225,6 +1354,7 @@ from .viki import (
     VikiIE,
     VikiChannelIE,
 )
     VikiIE,
     VikiChannelIE,
 )

+from .viqeo import ViqeoIE

 from .viu import (
     ViuIE,
     ViuPlaylistIE,
 from .viu import (
     ViuIE,
     ViuPlaylistIE,


@@ -1249,7 +1379,6 @@ from .voxmedia import (
     VoxMediaVolumeIE,
     VoxMediaIE,
 )
     VoxMediaVolumeIE,
     VoxMediaIE,
 )

-from .vporn import VpornIE

 from .vrt import VRTIE
 from .vrak import VrakIE
 from .vrv import (
 from .vrt import VRTIE
 from .vrak import VrakIE
 from .vrv import (


@@ -1263,6 +1392,7 @@ from .vuclip import VuClipIE
 from .vvvvid import VVVVIDIE
 from .vyborymos import VyboryMosIE
 from .vzaar import VzaarIE
 from .vvvvid import VVVVIDIE
 from .vyborymos import VyboryMosIE
 from .vzaar import VzaarIE

+from .wakanim import WakanimIE

 from .walla import WallaIE
 from .washingtonpost import (
     WashingtonPostIE,
 from .walla import WallaIE
 from .washingtonpost import (
     WashingtonPostIE,


@@ -1273,6 +1403,8 @@ 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 (


@@ -1283,18 +1415,19 @@ 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 .worldstarhiphop import WorldStarHipHopIE
 from .weiqitv import WeiqiTVIE
 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,
 )

+from .wwe import WWEIE

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


@@ -1308,6 +1441,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


@@ -1318,13 +1455,17 @@ from .xxxymovies import XXXYMoviesIE
 from .yahoo import (
     YahooIE,
     YahooSearchIE,
 from .yahoo import (
     YahooIE,
     YahooSearchIE,

+    YahooGyaOPlayerIE,
+    YahooGyaOIE,

 )
 )

+from .yandexdisk import YandexDiskIE

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

-from .yandexdisk import YandexDiskIE
+from .yandexvideo import YandexVideoIE
+from .yapfiles import YapFilesIE

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


@@ -1333,7 +1474,13 @@ from .youku import (
     YoukuIE,
     YoukuShowIE,
 )
     YoukuIE,
     YoukuShowIE,
 )

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

 from .youporn import YouPornIE
 from .youporn import YouPornIE

+from .yourporn import YourPornIE

 from .yourupload import YourUploadIE
 from .youtube import (
     YoutubeIE,
 from .yourupload import YourUploadIE
 from .youtube import (
     YoutubeIE,


@@ -1356,5 +1503,25 @@ from .youtube import (
 )
 from .zapiks import ZapiksIE
 from .zaq1 import Zaq1IE
 )
 from .zapiks import ZapiksIE
 from .zaq1 import Zaq1IE

+from .zattoo import (
+    BBVTVIE,
+    EinsUndEinsTVIE,
+    EWETVIE,
+    GlattvisionTVIE,
+    MNetTVIE,
+    MyVisionTVIE,
+    NetPlusIE,
+    OsnatelTVIE,
+    QuantumTVIE,
+    QuicklineIE,
+    QuicklineLiveIE,
+    SaltTVIE,
+    SAKTVIE,
+    VTXTVIE,
+    WalyTVIE,
+    ZattooIE,
+    ZattooLiveIE,
+)

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

+from .zype import ZypeIE