New upstream version 2020.06.16.1

[youtubedl] / youtube_dl / extractor / extractors.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 6fb65e4fe5bca6ee9ecfc2647a330604786a46ab..4b3092028f46fbfbb7ac8a64d43d10c1d1eff148 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -18,9 +18,10 @@ from .acast import (
     ACastIE,
     ACastChannelIE,
 )
     ACastIE,
     ACastChannelIE,
 )

-from .addanime import AddAnimeIE

 from .adn import ADNIE
 from .adn import ADNIE

+from .adobeconnect import AdobeConnectIE

 from .adobetv import (
 from .adobetv import (

+    AdobeTVEmbedIE,

     AdobeTVIE,
     AdobeTVShowIE,
     AdobeTVChannelIE,
     AdobeTVIE,
     AdobeTVShowIE,
     AdobeTVChannelIE,


@@ -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,21 +53,13 @@ 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,
 )
 from .arte import (
     ARDIE,
     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 (


@@ -86,13 +78,8 @@ from .awaan import (
     AWAANLiveIE,
     AWAANSeasonIE,
 )
     AWAANLiveIE,
     AWAANSeasonIE,
 )

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

 from .baidu import BaiduVideoIE
 from .baidu import BaiduVideoIE

-from .bambuser import BambuserIE, BambuserChannelIE

 from .bandcamp import BandcampIE, BandcampAlbumIE, BandcampWeeklyIE
 from .bbc import (
     BBCCoUkIE,
 from .bandcamp import BandcampIE, BandcampAlbumIE, BandcampWeeklyIE
 from .bbc import (
     BBCCoUkIE,


@@ -110,13 +97,21 @@ 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 (
     BiliBiliIE,
     BiliBiliBangumiIE,
 from .bigflix import BigflixIE
 from .bild import BildIE
 from .bilibili import (
     BiliBiliIE,
     BiliBiliBangumiIE,

+    BilibiliAudioIE,
+    BilibiliAudioAlbumIE,
+    BiliBiliPlayerIE,

 )
 from .biobiochiletv import BioBioChileTVIE
 )
 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,


@@ -137,6 +132,7 @@ from .brightcove import (
     BrightcoveLegacyIE,
     BrightcoveNewIE,
 )
     BrightcoveLegacyIE,
     BrightcoveNewIE,
 )

+from .businessinsider import BusinessInsiderIE

 from .buzzfeed import BuzzFeedIE
 from .byutv import BYUtvIE
 from .c56 import C56IE
 from .buzzfeed import BuzzFeedIE
 from .byutv import BYUtvIE
 from .c56 import C56IE


@@ -144,6 +140,8 @@ from .camdemy import (
     CamdemyIE,
     CamdemyFolderIE
 )
     CamdemyIE,
     CamdemyFolderIE
 )

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

 from .camwithher import CamWithHerIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .camwithher import CamWithHerIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE


@@ -168,11 +166,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


@@ -189,17 +191,26 @@ 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,
 from .cnn import (
     CNNIE,
     CNNBlogsIE,


@@ -213,17 +224,16 @@ from .comedycentral import (
     ComedyCentralTVIE,
     ToshIE,
 )
     ComedyCentralTVIE,
     ToshIE,
 )

-from .comcarcoff import ComCarCoffIE

 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
 from .commonprotocols import (
     MmsIE,
     RtmpIE,
 )
 from .condenast import CondeNastIE
 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
 from .commonprotocols import (
     MmsIE,
     RtmpIE,
 )
 from .condenast import CondeNastIE

+from .contv import CONtvIE

 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,


@@ -244,10 +254,6 @@ from .dailymotion import (
     DailymotionPlaylistIE,
     DailymotionUserIE,
 )
     DailymotionPlaylistIE,
     DailymotionUserIE,
 )

-from .daisuki import (
-    DaisukiMottoIE,
-    DaisukiMottoPlaylistIE,
-)

 from .daum import (
     DaumIE,
     DaumClipIE,
 from .daum import (
     DaumIE,
     DaumClipIE,


@@ -266,14 +272,7 @@ from .douyutv import (
     DouyuShowIE,
     DouyuTVIE,
 )
     DouyuShowIE,
     DouyuTVIE,
 )

-from .dplay import (
-    DPlayIE,
-    DPlayItIE,
-)
-from .dramafever import (
-    DramaFeverIE,
-    DramaFeverSeriesIE,
-)
+from .dplay import DPlayIE

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


@@ -281,6 +280,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


@@ -329,6 +329,7 @@ from .esri import EsriVideoIE
 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 (


@@ -350,7 +351,6 @@ from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE
 from .fivetv import FiveTVIE
 from .flickr import FlickrIE
 from .fivemin import FiveMinIE
 from .fivetv import FiveTVIE
 from .flickr import FlickrIE

-from .flipagram import FlipagramIE

 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .formula1 import Formula1IE
 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .formula1 import Formula1IE


@@ -361,12 +361,14 @@ from .fourtube import (
     FuxIE,
 )
 from .fox import FOXIE
     FuxIE,
 )
 from .fox import FOXIE

-from .fox9 import FOX9IE
+from .fox9 import (
+    FOX9IE,
+    FOX9NewsIE,
+)

 from .foxgay import FoxgayIE
 from .foxnews import (
     FoxNewsIE,
     FoxNewsArticleIE,
 from .foxgay import FoxgayIE
 from .foxnews import (
     FoxNewsIE,
     FoxNewsArticleIE,

-    FoxNewsInsiderIE,

 )
 from .foxsports import FoxSportsIE
 from .franceculture import FranceCultureIE
 )
 from .foxsports import FoxSportsIE
 from .franceculture import FranceCultureIE


@@ -376,6 +378,7 @@ from .francetv import (
     FranceTVSiteIE,
     FranceTVEmbedIE,
     FranceTVInfoIE,
     FranceTVSiteIE,
     FranceTVEmbedIE,
     FranceTVInfoIE,

+    FranceTVInfoSportIE,

     FranceTVJeunesseIE,
     GenerationWhatIE,
     CultureboxIE,
     FranceTVJeunesseIE,
     GenerationWhatIE,
     CultureboxIE,


@@ -383,19 +386,17 @@ from .francetv import (
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 from .freshlive import FreshLiveIE
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 from .freshlive import FreshLiveIE

-from .funimation import FunimationIE
-from .funk import (
-    FunkMixIE,
-    FunkChannelIE,
+from .frontendmasters import (
+    FrontendMastersIE,
+    FrontendMastersLessonIE,
+    FrontendMastersCourseIE

 )
 )

-from .funnyordie import FunnyOrDieIE
+from .funimation import FunimationIE
+from .funk import FunkIE

 from .fusion import FusionIE
 from .fxnetworks import FXNetworksIE
 from .fusion import FusionIE
 from .fxnetworks import FXNetworksIE

+from .gaia import GaiaIE

 from .gameinformer import GameInformerIE
 from .gameinformer import GameInformerIE

-from .gameone import (
-    GameOneIE,
-    GameOnePlaylistIE,
-)

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


@@ -411,7 +412,6 @@ from .globo import (
     GloboArticleIE,
 )
 from .go import GoIE
     GloboArticleIE,
 )
 from .go import GoIE

-from .go90 import Go90IE

 from .godtube import GodTubeIE
 from .golem import GolemIE
 from .googledrive import GoogleDriveIE
 from .godtube import GodTubeIE
 from .golem import GolemIE
 from .googledrive import GoogleDriveIE


@@ -420,17 +420,14 @@ from .googlesearch import GoogleSearchIE
 from .goshgay import GoshgayIE
 from .gputechconf import GPUTechConfIE
 from .groupon import GrouponIE
 from .goshgay import GoshgayIE
 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 .hidive import HiDiveIE
 from .historicfilms import HistoricFilmsIE
 from .hitbox import HitboxIE, HitboxLiveIE


@@ -449,8 +446,11 @@ 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 .hypem import HypemIE

-from .iconosquare import IconosquareIE

 from .ign import (
     IGNIE,
     OneUPIE,
 from .ign import (
     IGNIE,
     OneUPIE,


@@ -463,21 +463,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 .internazionale import InternazionaleIE
 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


@@ -493,7 +498,6 @@ from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 from .joj import JojIE
 from .jwplatform import JWPlatformIE
 from .jove import JoveIE
 from .joj import JojIE
 from .jwplatform import JWPlatformIE

-from .jpopsukitv import JpopsukiIE

 from .kakao import KakaoIE
 from .kaltura import KalturaIE
 from .kanalplay import KanalPlayIE
 from .kakao import KakaoIE
 from .kaltura import KalturaIE
 from .kanalplay import KanalPlayIE


@@ -504,9 +508,9 @@ 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 .keek import KeekIE
+from .kinja import KinjaEmbedIE
+from .kinopoisk import KinoPoiskIE

 from .konserthusetplay import KonserthusetPlayIE
 from .konserthusetplay import KonserthusetPlayIE

-from .kontrtube import KontrTubeIE

 from .krasview import KrasViewIE
 from .ku6 import Ku6IE
 from .kusi import KUSIIE
 from .krasview import KrasViewIE
 from .ku6 import Ku6IE
 from .kusi import KUSIIE


@@ -522,6 +526,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


@@ -529,8 +534,12 @@ from .lcp import (
     LcpPlayIE,
     LcpIE,
 )
     LcpPlayIE,
     LcpIE,
 )

-from .learnr import LearnrIE

 from .lecture2go import Lecture2GoIE
 from .lecture2go import Lecture2GoIE

+from .lecturio import (
+    LecturioIE,
+    LecturioCourseIE,
+    LecturioDeCourseIE,
+)

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


@@ -551,7 +560,13 @@ from .limelight import (
     LimelightChannelListIE,
 )
 from .line import LineTVIE
     LimelightChannelListIE,
 )
 from .line import LineTVIE

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

 from .litv import LiTVIE
 from .litv import LiTVIE

+from .livejournal import LiveJournalIE

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


@@ -570,24 +585,30 @@ from .lynda import (
     LyndaCourseIE
 )
 from .m6 import M6IE
     LyndaCourseIE
 )
 from .m6 import M6IE

-from .macgamestore import MacGameStoreIE

 from .mailru import (
     MailRuIE,
     MailRuMusicIE,
     MailRuMusicSearchIE,
 )
 from .mailru import (
     MailRuIE,
     MailRuMusicIE,
     MailRuMusicSearchIE,
 )

-from .makerschannel import MakersChannelIE
-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 .massengeschmacktv import MassengeschmackTVIE
 from .matchtv import MatchTVIE
 from .mdr import MDRIE
 from .mediaset import MediasetIE

-from .mediasite import MediasiteIE
+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,24 +623,24 @@ from .microsoftvirtualacademy import (
     MicrosoftVirtualAcademyIE,
     MicrosoftVirtualAcademyCourseIE,
 )
     MicrosoftVirtualAcademyIE,
     MicrosoftVirtualAcademyCourseIE,
 )

-from .minhateca import MinhatecaIE

 from .ministrygrid import MinistryGridIE
 from .minoto import MinotoIE
 from .miomio import MioMioIE
 from .ministrygrid import MinistryGridIE
 from .minoto import MinotoIE
 from .miomio import MioMioIE

-from .mit import TechTVMITIE, MITIE, OCWMITIE
+from .mit import TechTVMITIE, OCWMITIE

 from .mitele import MiTeleIE
 from .mixcloud import (
     MixcloudIE,
     MixcloudUserIE,
     MixcloudPlaylistIE,
 from .mitele import MiTeleIE
 from .mixcloud import (
     MixcloudIE,
     MixcloudUserIE,
     MixcloudPlaylistIE,

-    MixcloudStreamIE,

 )
 from .mlb import MLBIE
 from .mnet import MnetIE
 from .moevideo import MoeVideoIE
 )
 from .mlb import MLBIE
 from .mnet import MnetIE
 from .moevideo import MoeVideoIE

-from .mofosex import MofosexIE
+from .mofosex import (
+    MofosexIE,
+    MofosexEmbedIE,
+)

 from .mojvideo import MojvideoIE
 from .mojvideo import MojvideoIE

-from .moniker import MonikerIE

 from .morningstar import MorningstarIE
 from .motherless import (
     MotherlessIE,
 from .morningstar import MorningstarIE
 from .motherless import (
     MotherlessIE,


@@ -635,11 +656,11 @@ from .mtv import (
     MTVVideoIE,
     MTVServicesEmbeddedIE,
     MTVDEIE,
     MTVVideoIE,
     MTVServicesEmbeddedIE,
     MTVDEIE,

-    MTV81IE,
+    MTVJapanIE,

 )
 from .muenchentv import MuenchenTVIE
 )
 from .muenchentv import MuenchenTVIE

-from .musicplayon import MusicPlayOnIE

 from .mwave import MwaveIE, MwaveMeetGreetIE
 from .mwave import MwaveIE, MwaveMeetGreetIE

+from .mychannels import MyChannelsIE

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


@@ -649,8 +670,7 @@ from .myvi import (
 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


@@ -661,6 +681,7 @@ from .nbc import (
     NBCOlympicsIE,
     NBCOlympicsStreamIE,
     NBCSportsIE,
     NBCOlympicsIE,
     NBCOlympicsStreamIE,
     NBCSportsIE,

+    NBCSportsStreamIE,

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


@@ -697,15 +718,9 @@ 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,
     NickBrIE,
 from .nick import (
     NickIE,
     NickBrIE,


@@ -714,10 +729,7 @@ from .nick import (
     NickRuIE,
 )
 from .niconico import NiconicoIE, NiconicoPlaylistIE
     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


@@ -728,13 +740,9 @@ 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,
 )
 from .nowness import (
     NownessIE,


@@ -760,9 +768,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 (


@@ -786,25 +798,35 @@ from .ooyala import (
     OoyalaIE,
     OoyalaExternalIE,
 )
     OoyalaIE,
     OoyalaExternalIE,
 )

-from .openload import OpenloadIE

 from .ora import OraTVIE
 from .orf import (
     ORFTVthekIE,
     ORFFM4IE,
     ORFFM4StoryIE,
     ORFOE1IE,
 from .ora import OraTVIE
 from .orf import (
     ORFTVthekIE,
     ORFFM4IE,
     ORFFM4StoryIE,
     ORFOE1IE,

+    ORFOE3IE,
+    ORFNOEIE,
+    ORFWIEIE,
+    ORFBGLIE,
+    ORFOOEIE,
+    ORFSTMIE,
+    ORFKTNIE,
+    ORFSBGIE,
+    ORFTIRIE,
+    ORFVBGIE,

     ORFIPTVIE,
 )
     ORFIPTVIE,
 )

+from .outsidetv import OutsideTVIE

 from .packtpub import (
     PacktPubIE,
     PacktPubCourseIE,
 )
 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 .pearvideo import PearVideoIE
 from .pandoratv import PandoraTVIE
 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE
 from .pearvideo import PearVideoIE

+from .peertube import PeerTubeIE

 from .people import PeopleIE
 from .performgroup import PerformGroupIE
 from .periscope import (
 from .people import PeopleIE
 from .performgroup import PerformGroupIE
 from .periscope import (


@@ -821,7 +843,12 @@ from .picarto import (
 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


@@ -836,22 +863,25 @@ from .polskieradio import (
     PolskieRadioIE,
     PolskieRadioCategoryIE,
 )
     PolskieRadioIE,
     PolskieRadioCategoryIE,
 )

+from .popcorntimes import PopcorntimesIE

 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 .pyvideo import PyvideoIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .puls4 import Puls4IE
 from .pyvideo import PyvideoIE


@@ -880,10 +910,16 @@ from .rai import (
     RaiPlayPlaylistIE,
     RaiIE,
 )
     RaiPlayPlaylistIE,
     RaiIE,
 )

-from .raywenderlich import RayWenderlichIE
+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,


@@ -897,10 +933,6 @@ from .rentv import (
 from .restudy import RestudyIE
 from .reuters import ReutersIE
 from .reverbnation import ReverbNationIE
 from .restudy import RestudyIE
 from .reuters import ReutersIE
 from .reverbnation import ReverbNationIE

-from .revision3 import (
-    Revision3EmbedIE,
-    Revision3IE,
-)

 from .rice import RICEIE
 from .rmcdecouverte import RMCDecouverteIE
 from .ro220 import Ro220IE
 from .rice import RICEIE
 from .rmcdecouverte import RMCDecouverteIE
 from .ro220 import Ro220IE


@@ -922,9 +954,7 @@ 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 .ruhd import RUHDIE

-from .ruleporn import RulePornIE

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


@@ -946,11 +976,17 @@ from .savefrom import SaveFromIE
 from .sbs import SBSIE
 from .screencast import ScreencastIE
 from .screencastomatic import ScreencastOMaticIE
 from .sbs import SBSIE
 from .screencast import ScreencastIE
 from .screencastomatic import ScreencastOMaticIE

-from .scrippsnetworks import ScrippsNetworksWatchIE
+from .scrippsnetworks import (
+    ScrippsNetworksWatchIE,
+    ScrippsNetworksIE,
+)
+from .scte import (
+    SCTEIE,
+    SCTECourseIE,
+)

 from .seeker import SeekerIE
 from .senateisvp import SenateISVPIE
 from .sendtonews import SendtoNewsIE
 from .seeker import SeekerIE
 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 .servus import ServusIE
 from .sevenplus import SevenPlusIE
 from .sexu import SexuIE


@@ -974,7 +1010,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


@@ -988,6 +1027,7 @@ from .snotr import SnotrIE
 from .sohu import SohuIE
 from .sonyliv import SonyLIVIE
 from .soundcloud import (
 from .sohu import SohuIE
 from .sonyliv import SonyLIVIE
 from .soundcloud import (

+    SoundcloudEmbedIE,

     SoundcloudIE,
     SoundcloudSetIE,
     SoundcloudUserIE,
     SoundcloudIE,
     SoundcloudSetIE,
     SoundcloudUserIE,


@@ -1006,14 +1046,20 @@ 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 .springboardplatform import SpringboardPlatformIE
 from .sprout import SproutIE
 from .sportdeutschland import SportDeutschlandIE
 from .springboardplatform import SpringboardPlatformIE
 from .sprout import SproutIE


@@ -1025,14 +1071,19 @@ 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 .stretchinternet import StretchInternetIE
 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,
     SVTSeriesIE,
 )
     SVTPlayIE,
     SVTSeriesIE,
 )


@@ -1047,14 +1098,20 @@ 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 .tele13 import Tele13IE
 from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE


@@ -1062,12 +1119,14 @@ from .telegraaf import TelegraafIE
 from .telemb import TeleMBIE
 from .telequebec import (
     TeleQuebecIE,
 from .telemb import TeleMBIE
 from .telequebec import (
     TeleQuebecIE,

+    TeleQuebecSquatIE,

     TeleQuebecEmissionIE,
     TeleQuebecLiveIE,
 )
 from .teletask import TeleTaskIE
 from .telewebion import TelewebionIE
 from .tennistv import TennisTVIE
     TeleQuebecEmissionIE,
     TeleQuebecLiveIE,
 )
 from .teletask import TeleTaskIE
 from .telewebion import TelewebionIE
 from .tennistv import TennisTVIE

+from .tenplay import TenPlayIE

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


@@ -1084,6 +1143,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,


@@ -1102,6 +1165,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


@@ -1115,13 +1179,16 @@ from .tunein import (
 )
 from .tunepk import TunePkIE
 from .turbo import TurboIE
 )
 from .tunepk import TunePkIE
 from .turbo import TurboIE

-from .tutv import TutvIE

 from .tv2 import (
     TV2IE,
     TV2ArticleIE,
 from .tv2 import (
     TV2IE,
     TV2ArticleIE,

+    KatsomoIE,
+)
+from .tv2dk import (
+    TV2DKIE,
+    TV2DKBornholmPlayIE,

 )
 from .tv2hu import TV2HuIE
 )
 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


@@ -1136,26 +1203,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 .tvnow import (
     TVNowIE,
 from .tvnoe import TVNoeIE
 from .tvnow import (
     TVNowIE,

-    TVNowListIE,
+    TVNowNewIE,
+    TVNowSeasonIE,
+    TVNowAnnualIE,

     TVNowShowIE,
 )
 from .tvp import (
     TVPEmbedIE,
     TVPIE,
     TVNowShowIE,
 )
 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 .twentythreevideo import TwentyThreeVideoIE
 )
 from .tvplayer import TVPlayerIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE
 from .twentymin import TwentyMinutenIE
 from .twentythreevideo import TwentyThreeVideoIE

+from .twitcasting import TwitCastingIE

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


@@ -1172,15 +1244,23 @@ from .twitter import (
     TwitterCardIE,
     TwitterIE,
     TwitterAmplifyIE,
     TwitterCardIE,
     TwitterIE,
     TwitterAmplifyIE,

+    TwitterBroadcastIE,

 )
 from .udemy import (
     UdemyIE,
     UdemyCourseIE
 )
 from .udn import UDNEmbedIE
 )
 from .udemy import (
     UdemyIE,
     UdemyCourseIE
 )
 from .udn import UDNEmbedIE

-from .ufctv import UFCTVIE
+from .ufctv import (
+    UFCTVIE,
+    UFCArabiaIE,
+)

 from .uktvplay import UKTVPlayIE
 from .digiteka import DigitekaIE
 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


@@ -1189,10 +1269,6 @@ from .uplynk import (
     UplynkIE,
     UplynkPreplayIE,
 )
     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


@@ -1206,7 +1282,6 @@ from .varzesh3 import Varzesh3IE
 from .vbox7 import Vbox7IE
 from .veehd import VeeHDIE
 from .veoh import VeohIE
 from .vbox7 import Vbox7IE
 from .veehd import VeeHDIE
 from .veoh import VeohIE

-from .vessel import VesselIE

 from .vesti import VestiIE
 from .vevo import (
     VevoIE,
 from .vesti import VestiIE
 from .vevo import (
     VevoIE,


@@ -1228,13 +1303,11 @@ from .viddler import ViddlerIE
 from .videa import VideaIE
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
 from .videa import VideaIE
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE

-from .videomega import VideoMegaIE

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

-from .videopremium import VideoPremiumIE

 from .videopress import VideoPressIE
 from .vidio import VidioIE
 from .vidlii import VidLiiIE
 from .videopress import VideoPressIE
 from .vidio import VidioIE
 from .vidlii import VidLiiIE


@@ -1249,7 +1322,6 @@ from .viewlift import (
     ViewLiftIE,
     ViewLiftEmbedIE,
 )
     ViewLiftIE,
     ViewLiftEmbedIE,
 )

-from .viewster import ViewsterIE

 from .viidea import ViideaIE
 from .vimeo import (
     VimeoIE,
 from .viidea import ViideaIE
 from .vimeo import (
     VimeoIE,


@@ -1261,6 +1333,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 (


@@ -1271,6 +1344,7 @@ from .viki import (
     VikiIE,
     VikiChannelIE,
 )
     VikiIE,
     VikiChannelIE,
 )

+from .viqeo import ViqeoIE

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


@@ -1295,7 +1369,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 (


@@ -1309,6 +1382,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,


@@ -1332,27 +1406,24 @@ from .webofstories import (
     WebOfStoriesPlaylistIE,
 )
 from .weibo import (
     WebOfStoriesPlaylistIE,
 )
 from .weibo import (

-    WeiboIE, 
+    WeiboIE,

     WeiboMobileIE
 )
 from .weiqitv import WeiqiTVIE
     WeiboMobileIE
 )
 from .weiqitv import WeiqiTVIE

-from .wimp import WimpIE

 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE
 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 .xhamster import (
     XHamsterIE,
     XHamsterEmbedIE,
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .xfileshare import XFileShareIE
 from .xhamster import (
     XHamsterIE,
     XHamsterEmbedIE,

+    XHamsterUserIE,

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


@@ -1374,13 +1445,17 @@ from .xxxymovies import XXXYMoviesIE
 from .yahoo import (
     YahooIE,
     YahooSearchIE,
 from .yahoo import (
     YahooIE,
     YahooSearchIE,

+    YahooGyaOPlayerIE,
+    YahooGyaOIE,
+    YahooJapanNewsIE,

 )
 )

+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 .yapfiles import YapFilesIE
 from .yesjapan import YesJapanIE
 from .yinyuetai import YinYueTaiIE


@@ -1396,6 +1471,7 @@ from .younow import (
     YouNowMomentIE,
 )
 from .youporn import YouPornIE
     YouNowMomentIE,
 )
 from .youporn import YouPornIE

+from .yourporn import YourPornIE

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


@@ -1418,5 +1494,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