Import Debian changes 2020.01.24-0.1

[youtubedl] / youtube_dl / extractor / extractors.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 6fc5a18f502a39fd6fc3e0561fa3b6f93cf575d2..1cab440f46e9733e6182563b36a464d77b3610c7 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -1,39 +1,49 @@
 # flake8: noqa
 from __future__ import unicode_literals
 
 # flake8: noqa
 from __future__ import unicode_literals
 

-from .abc import ABCIE
-from .abc7news import Abc7NewsIE
+from .abc import (
+    ABCIE,
+    ABCIViewIE,
+)

 from .abcnews import (
     AbcNewsIE,
     AbcNewsVideoIE,
 )
 from .abcnews import (
     AbcNewsIE,
     AbcNewsVideoIE,
 )

+from .abcotvs import (
+    ABCOTVSIE,
+    ABCOTVSClipsIE,
+)

 from .academicearth import AcademicEarthCourseIE
 from .acast import (
     ACastIE,
     ACastChannelIE,
 )
 from .academicearth import AcademicEarthCourseIE
 from .acast import (
     ACastIE,
     ACastChannelIE,
 )

-from .addanime import AddAnimeIE
+from .adn import ADNIE
+from .adobeconnect import AdobeConnectIE

 from .adobetv import (
 from .adobetv import (

+    AdobeTVEmbedIE,

     AdobeTVIE,
     AdobeTVShowIE,
     AdobeTVChannelIE,
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE
     AdobeTVIE,
     AdobeTVShowIE,
     AdobeTVChannelIE,
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE

-from .aenetworks import AENetworksIE
+from .aenetworks import (
+    AENetworksIE,
+    HistoryTopicIE,
+)

 from .afreecatv import AfreecaTVIE
 from .afreecatv import AfreecaTVIE

-from .aftonbladet import AftonbladetIE

 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE
 from .alphaporno import AlphaPornoIE
 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 .animeondemand import AnimeOnDemandIE

-from .anitube import AnitubeIE
-from .anysex import AnySexIE
-from .aol import (
-    AolIE,
-    AolFeaturesIE,
-)
+from .anvato import AnvatoIE
+from .aol import AolIE

 from .allocine import AllocineIE
 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 (


@@ -41,32 +51,36 @@ from .appletrailers import (
     AppleTrailersSectionIE,
 )
 from .archiveorg import ArchiveOrgIE
     AppleTrailersSectionIE,
 )
 from .archiveorg import ArchiveOrgIE

+from .arkena import ArkenaIE

 from .ard import (
 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,
     ArteTVPlaylistIE,
 )
     ArteTVEmbedIE,
     ArteTVPlaylistIE,
 )

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

 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE
 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE

+from .atvat import ATVAtIE

 from .audimedia import AudiMediaIE
 from .audioboom import AudioBoomIE
 from .audiomack import AudiomackIE, AudiomackAlbumIE
 from .audimedia import AudiMediaIE
 from .audioboom import AudioBoomIE
 from .audiomack import AudiomackIE, AudiomackAlbumIE

-from .azubu import AzubuIE, AzubuLiveIE
+from .awaan import (
+    AWAANIE,
+    AWAANVideoIE,
+    AWAANLiveIE,
+    AWAANSeasonIE,
+)
+from .azmedien import AZMedienIE

 from .baidu import BaiduVideoIE
 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,


@@ -74,14 +88,29 @@ from .bbc import (
     BBCCoUkPlaylistIE,
     BBCIE,
 )
     BBCCoUkPlaylistIE,
     BBCIE,
 )

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

 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .beeg import BeegIE
 from .behindkink import BehindKinkIE

-from .beatportpro import BeatportProIE
+from .bellmedia import BellMediaIE
+from .beatport import BeatportIE

 from .bet import BetIE
 from .bet import BetIE

+from .bfi import BFIPlayerIE

 from .bigflix import BigflixIE
 from .bild import BildIE
 from .bigflix import BigflixIE
 from .bild import BildIE

-from .bilibili import BiliBiliIE
+from .bilibili import (
+    BiliBiliIE,
+    BiliBiliBangumiIE,
+    BilibiliAudioIE,
+    BilibiliAudioAlbumIE,
+)

 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,


@@ -90,14 +119,19 @@ from .bleacherreport import (
 from .blinkx import BlinkxIE
 from .bloomberg import BloombergIE
 from .bokecc import BokeCCIE
 from .blinkx import BlinkxIE
 from .bloomberg import BloombergIE
 from .bokecc import BokeCCIE

+from .bostonglobe import BostonGlobeIE

 from .bpb import BpbIE
 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 .byutv import BYUtvIE
 from .c56 import C56IE
 from .buzzfeed import BuzzFeedIE
 from .byutv import BYUtvIE
 from .c56 import C56IE


@@ -105,30 +139,50 @@ 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

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

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

+from .cartoonnetwork import CartoonNetworkIE

 from .cbc import (
     CBCIE,
     CBCPlayerIE,
 from .cbc import (
     CBCIE,
     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 .cda import CDAIE

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

 from .channel9 import Channel9IE
 from .channel9 import Channel9IE

+from .charlierose import CharlieRoseIE

 from .chaturbate import ChaturbateIE
 from .chilloutzone import ChilloutzoneIE
 from .chirbit import (
 from .chaturbate import ChaturbateIE
 from .chilloutzone import ChilloutzoneIE
 from .chirbit import (


@@ -136,31 +190,49 @@ from .chirbit import (
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE

-from .cliprs import ClipRsIE
-from .clipfish import ClipfishIE
+from .cinemax import CinemaxIE
+from .ciscolive import (
+    CiscoLiveSessionIE,
+    CiscoLiveSearchIE,
+)
+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 .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 ComedyCentralIE, ComedyCentralShowsIE
-from .comcarcoff import ComCarCoffIE
+from .comedycentral import (
+    ComedyCentralFullEpisodesIE,
+    ComedyCentralIE,
+    ComedyCentralShortnameIE,
+    ComedyCentralTVIE,
+    ToshIE,
+)

 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE

-from .commonprotocols import RtmpIE
+from .commonprotocols import (
+    MmsIE,
+    RtmpIE,
+)

 from .condenast import CondeNastIE
 from .condenast import CondeNastIE

+from .contv import CONtvIE
+from .corus import CorusIE

 from .cracked import CrackedIE
 from .crackle import CrackleIE
 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,


@@ -168,14 +240,18 @@ from .crunchyroll import (
 )
 from .cspan import CSpanIE
 from .ctsnews import CtsNewsIE
 )
 from .cspan import CSpanIE
 from .ctsnews import CtsNewsIE

+from .ctvnews import CTVNewsIE

 from .cultureunplugged import CultureUnpluggedIE
 from .cultureunplugged import CultureUnpluggedIE

+from .curiositystream import (
+    CuriosityStreamIE,
+    CuriosityStreamCollectionIE,
+)

 from .cwtv import CWTVIE
 from .dailymail import DailyMailIE
 from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,
     DailymotionUserIE,
 from .cwtv import CWTVIE
 from .dailymail import DailyMailIE
 from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,
     DailymotionUserIE,

-    DailymotionCloudIE,

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


@@ -184,32 +260,37 @@ from .daum import (
     DaumUserIE,
 )
 from .dbtv import DBTVIE
     DaumUserIE,
 )
 from .dbtv import DBTVIE

-from .dcn import (
-    DCNIE,
-    DCNVideoIE,
-    DCNLiveIE,
-    DCNSeasonIE,
-)

 from .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE
 from .democracynow import DemocracynowIE
 from .dfb import DFBIE
 from .dhm import DHMIE
 from .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE
 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 .dplay import DPlayIE
-from .dramafever import (
-    DramaFeverIE,
-    DramaFeverSeriesIE,
+from .douyutv import (
+    DouyuShowIE,
+    DouyuTVIE,

 )
 )

+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

-from .drtv import DRTVIE
+from .drtv import (
+    DRTVIE,
+    DRTVLiveIE,
+)
+from .dtube import DTubeIE

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

+from .discoverygo import (
+    DiscoveryGoIE,
+    DiscoveryGoPlaylistIE,
+)
+from .discoverynetworks import DiscoveryNetworksDeIE
+from .discoveryvr import DiscoveryVRIE
+from .disney import DisneyIE

 from .dispeak import DigitallySpeakingIE
 from .dropbox import DropboxIE
 from .dw import (
 from .dispeak import DigitallySpeakingIE
 from .dropbox import DropboxIE
 from .dw import (


@@ -219,13 +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,
+    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


@@ -233,58 +319,86 @@ from .engadget import EngadgetIE
 from .eporner import EpornerIE
 from .eroprofile import EroProfileIE
 from .escapist import EscapistIE
 from .eporner import EpornerIE
 from .eroprofile import EroProfileIE
 from .escapist import EscapistIE

-from .espn import ESPNIE
+from .espn import (
+    ESPNIE,
+    ESPNArticleIE,
+    FiveThirtyEightIE,
+)

 from .esri import EsriVideoIE
 from .europa import EuropaIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .esri import EsriVideoIE
 from .europa import EuropaIE
 from .everyonesmixtape import EveryonesMixtapeIE

-from .exfm import ExfmIE

 from .expotv import ExpoTVIE
 from .expotv import ExpoTVIE

+from .expressen import ExpressenIE

 from .extremetube import ExtremeTubeIE
 from .eyedotv import EyedoTVIE
 from .extremetube import ExtremeTubeIE
 from .eyedotv import EyedoTVIE

-from .facebook import FacebookIE
+from .facebook import (
+    FacebookIE,
+    FacebookPluginsVideoIE,
+)

 from .faz import FazIE
 from .faz import FazIE

-from .fc2 import FC2IE
+from .fc2 import (
+    FC2IE,
+    FC2EmbedIE,
+)

 from .fczenit import FczenitIE
 from .fczenit import FczenitIE

-from .firstpost import FirstpostIE
+from .filmon import (
+    FilmOnIE,
+    FilmOnChannelIE,
+)
+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 .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .formula1 import Formula1IE
 from .flickr import FlickrIE
 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 .fox import FOXIE

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

 from .foxgay import FoxgayIE
 from .foxgay import FoxgayIE

-from .foxnews import FoxNewsIE
-from .foxsports import FoxSportsIE
-from .franceculture import (
-    FranceCultureIE,
-    FranceCultureEmissionIE,
+from .foxnews import (
+    FoxNewsIE,
+    FoxNewsArticleIE,

 )
 )

+from .foxsports import FoxSportsIE
+from .franceculture import FranceCultureIE

 from .franceinter import FranceInterIE
 from .francetv import (
 from .franceinter import FranceInterIE
 from .francetv import (

-    PluzzIE,
-    FranceTvInfoIE,

     FranceTVIE,
     FranceTVIE,

-    GenerationQuoiIE,
+    FranceTVSiteIE,
+    FranceTVEmbedIE,
+    FranceTVInfoIE,
+    FranceTVInfoSportIE,
+    FranceTVJeunesseIE,
+    GenerationWhatIE,

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

-from .freevideo import FreeVideoIE
+from .freshlive import FreshLiveIE
+from .frontendmasters import (
+    FrontendMastersIE,
+    FrontendMastersLessonIE,
+    FrontendMastersCourseIE
+)

 from .funimation import FunimationIE
 from .funimation import FunimationIE

-from .funnyordie import FunnyOrDieIE
+from .funk import FunkIE
+from .fusion import FusionIE
+from .fxnetworks import FXNetworksIE
+from .gaia import GaiaIE

 from .gameinformer import GameInformerIE
 from .gameinformer import GameInformerIE

-from .gamekings import GamekingsIE
-from .gameone import (
-    GameOneIE,
-    GameOnePlaylistIE,
-)
-from .gamersyde import GamersydeIE

 from .gamespot import GameSpotIE
 from .gamestar import GameStarIE
 from .gamespot import GameSpotIE
 from .gamestar import GameStarIE

+from .gaskrank import GaskrankIE

 from .gazeta import GazetaIE
 from .gdcvault import GDCVaultIE
 from .generic import GenericIE
 from .gazeta import GazetaIE
 from .gdcvault import GDCVaultIE
 from .generic import GenericIE


@@ -296,9 +410,8 @@ from .globo import (
     GloboIE,
     GloboArticleIE,
 )
     GloboIE,
     GloboArticleIE,
 )

+from .go import GoIE

 from .godtube import GodTubeIE
 from .godtube import GodTubeIE

-from .godtv import GodTVIE
-from .goldenmoustache import GoldenMoustacheIE

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


@@ -306,23 +419,37 @@ 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
 from .hearthisat import HearThisAtIE
 from .heise import HeiseIE
 from .hellporno import HellPornoIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 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 .hketv import HKETVIE
+from .hidive import HiDiveIE

 from .historicfilms import HistoricFilmsIE
 from .hitbox import HitboxIE, HitboxLiveIE
 from .historicfilms import HistoricFilmsIE
 from .hitbox import HitboxIE, HitboxLiveIE

+from .hitrecord import HitRecordIE

 from .hornbunny import HornBunnyIE
 from .hotnewhiphop import HotNewHipHopIE
 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 .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE

+from .hrti import (
+    HRTiIE,
+    HRTiPlaylistIE,
+)
+from .huajiao import HuajiaoIE

 from .huffpost import HuffPostIE
 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,


@@ -335,39 +462,55 @@ from .imdb import (
 from .imgur import (
     ImgurIE,
     ImgurAlbumIE,
 from .imgur import (
     ImgurIE,
     ImgurAlbumIE,

+    ImgurGalleryIE,

 )
 from .ina import InaIE
 )
 from .ina import InaIE

-from .indavideo import (
-    IndavideoIE,
-    IndavideoEmbedIE,
-)
+from .inc import IncIE
+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,
+    ITVBTCCIE,
+)

 from .ivi import (
     IviIE,
     IviCompilationIE
 )
 from .ivideon import IvideonIE
 from .ivi import (
     IviIE,
     IviCompilationIE
 )
 from .ivideon import IvideonIE

+from .iwara import IwaraIE

 from .izlesene import IzleseneIE
 from .izlesene import IzleseneIE

+from .jamendo import (
+    JamendoIE,
+    JamendoAlbumIE,
+)

 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 .kanalplay import KanalPlayIE
 from .kankan import KankanIE
 from .karaoketv import KaraoketvIE
 from .karrierevideos import KarriereVideosIE
 from .keezmovies import KeezMoviesIE
 from .kaltura import KalturaIE
 from .kanalplay import KanalPlayIE
 from .kankan import KankanIE
 from .karaoketv import KaraoketvIE
 from .karrierevideos import KarriereVideosIE
 from .keezmovies import KeezMoviesIE

+from .ketnet import KetnetIE

 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 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


@@ -380,15 +523,31 @@ from .kuwo import (
     KuwoMvIE,
 )
 from .la7 import LA7IE
     KuwoMvIE,
 )
 from .la7 import LA7IE

-from .laola1tv import Laola1TvIE
-from .learnr import LearnrIE
+from .laola1tv import (
+    Laola1TvEmbedIE,
+    Laola1TvIE,
+    EHFTVIE,
+    ITTFIE,
+)
+from .lci import LCIIE
+from .lcp import (
+    LcpPlayIE,
+    LcpIE,
+)

 from .lecture2go import Lecture2GoIE
 from .lecture2go import Lecture2GoIE

-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 (


@@ -400,8 +559,18 @@ 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 .litv import LiTVIE

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

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


@@ -416,61 +585,89 @@ from .lynda import (
     LyndaCourseIE
 )
 from .m6 import M6IE
     LyndaCourseIE
 )
 from .m6 import M6IE

-from .macgamestore import MacGameStoreIE
-from .mailru import MailRuIE
-from .makerschannel import MakersChannelIE
-from .makertv import MakerTVIE
+from .mailru import (
+    MailRuIE,
+    MailRuMusicIE,
+    MailRuMusicSearchIE,
+)
+from .malltv import MallTVIE
+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 .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 .melonvod import MelonVODIE
+from .meta import METAIE

 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mgoon import MgoonIE
 from .mgtv import MGTVIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mgoon import MgoonIE
 from .mgtv import MGTVIE

+from .miaopai import MiaoPaiIE

 from .microsoftvirtualacademy import (
     MicrosoftVirtualAcademyIE,
     MicrosoftVirtualAcademyCourseIE,
 )
 from .microsoftvirtualacademy import (
     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 .mlb import MLBIE
 from .mnet import MnetIE

-from .mpora import MporaIE

 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

+from .movingimage import MovingImageIE
+from .msn import MSNIE

 from .mtv import (
     MTVIE,
 from .mtv import (
     MTVIE,

+    MTVVideoIE,

     MTVServicesEmbeddedIE,
     MTVServicesEmbeddedIE,

-    MTVIggyIE,

     MTVDEIE,
     MTVDEIE,

+    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 .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 (
 from .myvidster import MyVidsterIE
 from .nationalgeographic import (

-    NationalGeographicIE,
-    NationalGeographicChannelIE,
+    NationalGeographicVideoIE,
+    NationalGeographicTVIE,

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


@@ -478,7 +675,10 @@ from .nbc import (
     CSNNEIE,
     NBCIE,
     NBCNewsIE,
     CSNNEIE,
     NBCIE,
     NBCNewsIE,

+    NBCOlympicsIE,
+    NBCOlympicsStreamIE,

     NBCSportsIE,
     NBCSportsIE,

+    NBCSportsStreamIE,

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


@@ -500,57 +700,63 @@ from .neteasemusic import (
     NetEaseMusicProgramIE,
     NetEaseMusicDjRadioIE,
 )
     NetEaseMusicProgramIE,
     NetEaseMusicDjRadioIE,
 )

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

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

+    NextTVIE,

 )
 )

-from .nextmovie import NextMovieIE
-from .nfb import NFBIE
-from .nfl import NFLIE
-from .nhl import (
-    NHLVideocenterIE,
-    NHLNewsIE,
-    NHLVideocenterCategoryIE,
-    NHLIE,
+from .nexx import (
+    NexxIE,
+    NexxEmbedIE,

 )
 )

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

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

+    NickBrIE,

     NickDeIE,
     NickDeIE,

+    NickNightIE,
+    NickRuIE,

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

+from .ninecninemedia import NineCNineMediaIE

 from .ninegag import NineGagIE
 from .ninegag import NineGagIE

+from .ninenow import NineNowIE
+from .nintendo import NintendoIE
+from .njpwworld import NJPWWorldIE
+from .nobelprize import NobelPrizeIE

 from .noco import NocoIE
 from .noco import NocoIE

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

 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE
 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 (
 from .noz import NozIE
 from .npo import (

+    AndereTijdenIE,

     NPOIE,
     NPOLiveIE,
     NPORadioIE,
     NPORadioFragmentIE,
     SchoolTVIE,
     NPOIE,
     NPOLiveIE,
     NPORadioIE,
     NPORadioFragmentIE,
     SchoolTVIE,

+    HetKlokhuisIE,

     VPROIE,
     VPROIE,

-    WNLIE
+    WNLIE,

 )
 from .npr import NprIE
 from .nrk import (
 )
 from .npr import NprIE
 from .nrk import (


@@ -558,7 +764,14 @@ from .nrk import (
     NRKPlaylistIE,
     NRKSkoleIE,
     NRKTVIE,
     NRKPlaylistIE,
     NRKSkoleIE,
     NRKTVIE,

-)
+    NRKTVDirekteIE,
+    NRKTVEpisodeIE,
+    NRKTVEpisodesIE,
+    NRKTVSeasonIE,
+    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 (


@@ -566,26 +779,43 @@ from .nytimes import (
     NYTimesArticleIE,
 )
 from .nuvid import NuvidIE
     NYTimesArticleIE,
 )
 from .nuvid import NuvidIE

+from .nzz import NZZIE
+from .odatv import OdaTVIE

 from .odnoklassniki import OdnoklassnikiIE
 from .oktoberfesttv import OktoberfestTVIE
 from .odnoklassniki import OdnoklassnikiIE
 from .oktoberfesttv import OktoberfestTVIE

+from .ondemandkorea import OnDemandKoreaIE
+from .onet import (
+    OnetIE,
+    OnetChannelIE,
+    OnetMVPIE,
+    OnetPlIE,
+)

 from .onionstudios import OnionStudiosIE
 from .ooyala import (
     OoyalaIE,
     OoyalaExternalIE,
 )
 from .onionstudios import OnionStudiosIE
 from .ooyala import (
     OoyalaIE,
     OoyalaExternalIE,
 )

-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 .outsidetv import OutsideTVIE
+from .packtpub import (
+    PacktPubIE,
+    PacktPubCourseIE,
+)

 from .pandoratv import PandoraTVIE
 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE
 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 .people import PeopleIE

+from .performgroup import PerformGroupIE

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


@@ -593,10 +823,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 .pinkbike import PinkbikeIE
 from .pladform import PladformIE

-from .played import PlayedIE
+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


@@ -606,19 +845,29 @@ from .pluralsight import (
     PluralsightCourseIE,
 )
 from .podomatic import PodomaticIE
     PluralsightCourseIE,
 )
 from .podomatic import PodomaticIE

+from .pokemon import PokemonIE
+from .polskieradio import (
+    PolskieRadioIE,
+    PolskieRadioCategoryIE,
+)
+from .popcorntv import PopcornTVIE

 from .porn91 import Porn91IE
 from .porn91 import Porn91IE

+from .porncom import PornComIE

 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


@@ -642,46 +891,67 @@ 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,
 )
     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,
+    RedBullTVRrnContentIE,
+)
+from .reddit import (
+    RedditIE,
+    RedditRIE,
+)

 from .redtube import RedTubeIE
 from .regiotv import RegioTVIE
 from .redtube import RedTubeIE
 from .regiotv import RegioTVIE

+from .rentv import (
+    RENTVIE,
+    RENTVArticleIE,
+)

 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 .rice import RICEIE

-from .ringtv import RingTVIE
+from .rmcdecouverte import RMCDecouverteIE

 from .ro220 import Ro220IE
 from .rockstargames import RockstarGamesIE
 from .ro220 import Ro220IE
 from .rockstargames import RockstarGamesIE

+from .roosterteeth import RoosterTeethIE

 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE

+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 .rtp import RTPIE
 from .rts import RTSIE

-from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE
+from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE

 from .rtvnh import RTVNHIE
 from .rtvnh import RTVNHIE

+from .rtvs import RTVSIE

 from .ruhd import RUHDIE
 from .ruhd import RUHDIE

-from .ruleporn import RulePornIE

 from .rutube import (
     RutubeIE,
     RutubeChannelIE,
     RutubeEmbedIE,
     RutubeMovieIE,
     RutubePersonIE,
 from .rutube import (
     RutubeIE,
     RutubeChannelIE,
     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,


@@ -690,25 +960,48 @@ from .safari import (
 from .sapo import SapoIE
 from .savefrom import SaveFromIE
 from .sbs import SBSIE
 from .sapo import SapoIE
 from .savefrom import SaveFromIE
 from .sbs import SBSIE

-from .scivee import SciVeeIE

 from .screencast import ScreencastIE
 from .screencastomatic import ScreencastOMaticIE
 from .screencast import ScreencastIE
 from .screencastomatic import ScreencastOMaticIE

-from .screenjunkies import ScreenJunkiesIE
-from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE
+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 .sexu import SexuIE

-from .shahid import ShahidIE
-from .shared import SharedIE
-from .sharesix import ShareSixIE
+from .seznamzpravy import (
+    SeznamZpravyIE,
+    SeznamZpravyArticleIE,
+)
+from .shahid import (
+    ShahidIE,
+    ShahidShowIE,
+)
+from .shared import (
+    SharedIE,
+    VivoIE,
+)
+from .showroomlive import ShowRoomLiveIE

 from .sina import SinaIE
 from .sina import SinaIE

+from .sixplay import SixPlayIE
+from .skylinewebcams import SkylineWebcamsIE

 from .skynewsarabia import (
     SkyNewsArabiaIE,
     SkyNewsArabiaArticleIE,
 )
 from .skynewsarabia import (
     SkyNewsArabiaIE,
     SkyNewsArabiaArticleIE,
 )

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

 from .slideshare import SlideshareIE
 from .slideshare import SlideshareIE

+from .slideslive import SlidesLiveIE

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


@@ -718,12 +1011,15 @@ from .smotri import (
 )
 from .snotr import SnotrIE
 from .sohu import SohuIE
 )
 from .snotr import SnotrIE
 from .sohu import SohuIE

+from .sonyliv import SonyLIVIE

 from .soundcloud import (
 from .soundcloud import (

+    SoundcloudEmbedIE,

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

+    SoundcloudTrackStationIE,

     SoundcloudPlaylistIE,
     SoundcloudPlaylistIE,

-    SoundcloudSearchIE
+    SoundcloudSearchIE,

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


@@ -736,34 +1032,46 @@ 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 (
-    SportBoxIE,
-    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,
     SRGSSRPlayIE,
 )
 from .srmediathek import SRMediathekIE
 from .srgssr import (
     SRGSSRIE,
     SRGSSRPlayIE,
 )
 from .srmediathek import SRMediathekIE

-from .ssa import SSAIE

 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE

+from .streamable import StreamableIE

 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


@@ -772,39 +1080,60 @@ from .tagesschau import (
     TagesschauPlayerIE,
     TagesschauIE,
 )
     TagesschauPlayerIE,
     TagesschauIE,
 )

-from .tapely import TapelyIE

 from .tass import TassIE
 from .tass import TassIE

+from .tastytrade import TastyTradeIE
+from .tbs import TBSIE

 from .tdslifeway import TDSLifewayIE
 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,
+    TeleQuebecSquatIE,
+    TeleQuebecEmissionIE,
+    TeleQuebecLiveIE,
+)

 from .teletask import TeleTaskIE
 from .telewebion import TelewebionIE
 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 .testurl import TestURLIE
 from .tf1 import TF1IE

+from .tfo import TFOIE

 from .theintercept import TheInterceptIE
 from .theplatform import (
     ThePlatformIE,
     ThePlatformFeedIE,
 )
 from .thescene import TheSceneIE
 from .theintercept import TheInterceptIE
 from .theplatform import (
     ThePlatformIE,
     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 .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE

+from .thisoldhouse import ThisOldHouseIE

 from .threeqsdn import ThreeQSDNIE
 from .threeqsdn import ThreeQSDNIE

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

 from .tinypic import TinyPicIE
 from .tinypic import TinyPicIE

-from .tlc import TlcDeIE

 from .tmz import (
     TMZIE,
     TMZArticleIE,
 from .tmz import (
     TMZIE,
     TMZArticleIE,


@@ -816,23 +1145,16 @@ from .tnaflix import (
     MovieFapIE,
 )
 from .toggle import ToggleIE
     MovieFapIE,
 )
 from .toggle import ToggleIE

-from .thvideo import (
-    THVideoIE,
-    THVideoPlaylistIE
-)
+from .tonline import TOnlineIE
+from .toongoggles import ToonGogglesIE

 from .toutv import TouTvIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE
 from .toutv import TouTvIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE

-from .trollvids import TrollvidsIE
-from .trutube import TruTubeIE
+from .trunews import TruNewsIE
+from .trutv import TruTVIE

 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE
 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,


@@ -841,38 +1163,66 @@ from .tunein import (
     TuneInTopicIE,
     TuneInShortenerIE,
 )
     TuneInTopicIE,
     TuneInShortenerIE,
 )

+from .tunepk import TunePkIE

 from .turbo import TurboIE
 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 .tv3 import TV3IE
+from .tv2hu import TV2HuIE

 from .tv4 import TV4IE
 from .tv4 import TV4IE

+from .tv5mondeplus import TV5MondePlusIE
+from .tva import TVAIE
+from .tvanouvelles import (
+    TVANouvellesIE,
+    TVANouvellesArticleIE,
+)

 from .tvc import (
     TVCIE,
     TVCArticleIE,
 )
 from .tvigle import TvigleIE
 from .tvland import TVLandIE
 from .tvc import (
     TVCIE,
     TVCArticleIE,
 )
 from .tvigle import TvigleIE
 from .tvland import TVLandIE

+from .tvn24 import TVN24IE
+from .tvnet import TVNetIE
+from .tvnoe import TVNoeIE
+from .tvnow import (
+    TVNowIE,
+    TVNowNewIE,
+    TVNowSeasonIE,
+    TVNowAnnualIE,
+    TVNowShowIE,
+)

 from .tvp import (
 from .tvp import (

+    TVPEmbedIE,

     TVPIE,
     TVPIE,

-    TVPSeriesIE,
+    TVPWebsiteIE,
+)
+from .tvplay import (
+    TVPlayIE,
+    ViafreeIE,
+    TVPlayHomeIE,

 )
 )

-from .tvplay import TVPlayIE
+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 .twitcasting import TwitCastingIE

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

+    TwitchAllVideosIE,
+    TwitchUploadsIE,

     TwitchPastBroadcastsIE,
     TwitchPastBroadcastsIE,

+    TwitchHighlightsIE,

     TwitchStreamIE,
     TwitchClipsIE,
 )
     TwitchStreamIE,
     TwitchClipsIE,
 )


@@ -880,15 +1230,34 @@ 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,
+    UFCArabiaIE,
+)
+from .uktvplay import UKTVPlayIE

 from .digiteka import DigitekaIE
 from .digiteka import DigitekaIE

+from .dlive import (
+    DLiveVODIE,
+    DLiveStreamIE,
+)
+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 .urort import UrortIE
 from .urort import UrortIE

+from .urplay import URPlayIE
+from .usanetwork import USANetworkIE

 from .usatoday import USATodayIE
 from .ustream import UstreamIE, UstreamChannelIE
 from .ustudio import (
 from .usatoday import USATodayIE
 from .ustream import UstreamIE, UstreamChannelIE
 from .ustudio import (


@@ -899,7 +1268,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,


@@ -913,20 +1281,22 @@ from .vgtv import (
 from .vh1 import VH1IE
 from .vice import (
     ViceIE,
 from .vh1 import VH1IE
 from .vice import (
     ViceIE,

+    ViceArticleIE,

     ViceShowIE,
 )
     ViceShowIE,
 )

+from .vidbit import VidbitIE

 from .viddler import ViddlerIE
 from .viddler import ViddlerIE

+from .videa import VideaIE

 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
 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 .videott import VideoTtIE
+from .videopress import VideoPressIE

 from .vidio import VidioIE
 from .vidio import VidioIE

+from .vidlii import VidLiiIE

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


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


@@ -950,6 +1319,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 (


@@ -960,48 +1330,86 @@ from .viki import (
     VikiIE,
     VikiChannelIE,
 )
     VikiIE,
     VikiChannelIE,
 )

+from .viqeo import ViqeoIE
+from .viu import (
+    ViuIE,
+    ViuPlaylistIE,
+    ViuOTTIE,
+)

 from .vk import (
     VKIE,
     VKUserVideosIE,
 from .vk import (
     VKIE,
     VKUserVideosIE,

+    VKWallPostIE,
+)
+from .vlive import (
+    VLiveIE,
+    VLiveChannelIE,
+    VLivePlaylistIE

 )
 )

-from .vlive import VLiveIE

 from .vodlocker import VodlockerIE
 from .vodlocker import VodlockerIE

+from .vodpl import VODPlIE
+from .vodplatform import VODPlatformIE

 from .voicerepublic import VoiceRepublicIE
 from .voicerepublic import VoiceRepublicIE

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

 from .vrt import VRTIE
 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 .vube import VubeIE
 from .vuclip import VuClipIE

+from .vvvvid import VVVVIDIE
+from .vyborymos import VyboryMosIE
+from .vzaar import VzaarIE
+from .wakanim import WakanimIE

 from .walla import WallaIE
 from .washingtonpost import (
     WashingtonPostIE,
     WashingtonPostArticleIE,
 )
 from .wat import WatIE
 from .walla import WallaIE
 from .washingtonpost import (
     WashingtonPostIE,
     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,
 )
     WDRMobileIE,
 )

+from .webcaster import (
+    WebcasterIE,
+    WebcasterFeedIE,
+)

 from .webofstories import (
     WebOfStoriesIE,
     WebOfStoriesPlaylistIE,
 )
 from .webofstories import (
     WebOfStoriesIE,
     WebOfStoriesPlaylistIE,
 )

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

 from .weiqitv import WeiqiTVIE
 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
+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,


@@ -1009,6 +1417,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


@@ -1019,13 +1431,18 @@ from .xxxymovies import XXXYMoviesIE
 from .yahoo import (
     YahooIE,
     YahooSearchIE,
 from .yahoo import (
     YahooIE,
     YahooSearchIE,

+    YahooGyaOPlayerIE,
+    YahooGyaOIE,
+    YahooJapanNewsIE,

 )
 )

-from .yam import YamIE
+from .yandexdisk import YandexDiskIE

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

+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


@@ -1034,7 +1451,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,


@@ -1056,9 +1479,26 @@ from .youtube import (
     YoutubeWatchLaterIE,
 )
 from .zapiks import ZapiksIE
     YoutubeWatchLaterIE,
 )
 from .zapiks import ZapiksIE

-from .zdf import ZDFIE, ZDFChannelIE
-from .zingmp3 import (
-    ZingMp3SongIE,
-    ZingMp3AlbumIE,
+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 .zippcast import ZippCastIE
+from .zdf import ZDFIE, ZDFChannelIE
+from .zingmp3 import ZingMp3IE
+from .zype import ZypeIE