debian/watch: Skip pgpsigurlmangle for the moment.

[youtubedl] / youtube_dl / extractor / __init__.py

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 8ec0c1032a1538f87a17a66e4211deb2db88418d..1ae606f1eaaa669f71ad3d3c24b7b222545a0520 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -3,52 +3,84 @@ from __future__ import unicode_literals
 from .abc import ABCIE
 from .abc7news import Abc7NewsIE
 from .academicearth import AcademicEarthCourseIE
 from .abc import ABCIE
 from .abc7news import Abc7NewsIE
 from .academicearth import AcademicEarthCourseIE

+from .acast import (
+    ACastIE,
+    ACastChannelIE,
+)

 from .addanime import AddAnimeIE
 from .addanime import AddAnimeIE

-from .adobetv import AdobeTVIE
+from .adobetv import (
+    AdobeTVIE,
+    AdobeTVShowIE,
+    AdobeTVChannelIE,
+    AdobeTVVideoIE,
+)

 from .adultswim import AdultSwimIE
 from .adultswim import AdultSwimIE

-from .aftenposten import AftenpostenIE
+from .aenetworks import AENetworksIE

 from .aftonbladet import AftonbladetIE
 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE
 from .alphaporno import AlphaPornoIE
 from .aftonbladet import AftonbladetIE
 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE
 from .alphaporno import AlphaPornoIE

+from .animeondemand import AnimeOnDemandIE

 from .anitube import AnitubeIE
 from .anysex import AnySexIE
 from .aol import AolIE
 from .allocine import AllocineIE
 from .aparat import AparatIE
 from .anitube import AnitubeIE
 from .anysex import AnySexIE
 from .aol import AolIE
 from .allocine import AllocineIE
 from .aparat import AparatIE

-from .appletrailers import AppleTrailersIE
+from .appleconnect import AppleConnectIE
+from .appletrailers import (
+    AppleTrailersIE,
+    AppleTrailersSectionIE,
+)

 from .archiveorg import ArchiveOrgIE
 from .archiveorg import ArchiveOrgIE

-from .ard import ARDIE, ARDMediathekIE
+from .ard import (
+    ARDIE,
+    ARDMediathekIE,
+    SportschauIE,
+)

 from .arte import (
     ArteTvIE,
     ArteTVPlus7IE,
     ArteTVCreativeIE,
     ArteTVConcertIE,
     ArteTVFutureIE,
 from .arte import (
     ArteTvIE,
     ArteTVPlus7IE,
     ArteTVCreativeIE,
     ArteTVConcertIE,
     ArteTVFutureIE,

+    ArteTVCinemaIE,

     ArteTVDDCIE,
     ArteTVDDCIE,

+    ArteTVMagazineIE,

     ArteTVEmbedIE,
 )
 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE
     ArteTVEmbedIE,
 )
 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE

+from .audimedia import AudiMediaIE

 from .audiomack import AudiomackIE, AudiomackAlbumIE
 from .audiomack import AudiomackIE, AudiomackAlbumIE

-from .azubu import AzubuIE
+from .azubu import AzubuIE, AzubuLiveIE

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

-from .bbccouk import BBCCoUkIE
+from .bbc import (
+    BBCCoUkIE,
+    BBCCoUkArticleIE,
+    BBCIE,
+)

 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .beatportpro import BeatportProIE
 from .bet import BetIE
 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .beatportpro import BeatportProIE
 from .bet import BetIE

+from .bigflix import BigflixIE

 from .bild import BildIE
 from .bilibili import BiliBiliIE
 from .bild import BildIE
 from .bilibili import BiliBiliIE

+from .bleacherreport import (
+    BleacherReportIE,
+    BleacherReportCMSIE,
+)

 from .blinkx import BlinkxIE
 from .blinkx import BlinkxIE

-from .bliptv import BlipTVIE, BlipTVUserIE

 from .bloomberg import BloombergIE
 from .bpb import BpbIE
 from .br import BRIE
 from .breakcom import BreakIE
 from .bloomberg import BloombergIE
 from .bpb import BpbIE
 from .br import BRIE
 from .breakcom import BreakIE

-from .brightcove import BrightcoveIE
+from .brightcove import (
+    BrightcoveLegacyIE,
+    BrightcoveNewIE,
+)

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


@@ -56,15 +88,23 @@ from .camdemy import (
     CamdemyIE,
     CamdemyFolderIE
 )
     CamdemyIE,
     CamdemyFolderIE
 )

-from .canal13cl import Canal13clIE

 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE

+from .canvas import CanvasIE
+from .cbc import (
+    CBCIE,
+    CBCPlayerIE,
+)

 from .cbs import CBSIE
 from .cbs import CBSIE

-from .cbsnews import CBSNewsIE
+from .cbsnews import (
+    CBSNewsIE,
+    CBSNewsLiveVideoIE,
+)

 from .cbssports import CBSSportsIE
 from .ccc import CCCIE
 from .ceskatelevize import CeskaTelevizeIE
 from .channel9 import Channel9IE
 from .cbssports import CBSSportsIE
 from .ccc import CCCIE
 from .ceskatelevize import CeskaTelevizeIE
 from .channel9 import Channel9IE

+from .chaturbate import ChaturbateIE

 from .chilloutzone import ChilloutzoneIE
 from .chirbit import (
     ChirbitIE,
 from .chilloutzone import ChilloutzoneIE
 from .chirbit import (
     ChirbitIE,


@@ -77,6 +117,7 @@ from .cliphunter import CliphunterIE
 from .clipsyndicate import ClipsyndicateIE
 from .cloudy import CloudyIE
 from .clubic import ClubicIE
 from .clipsyndicate import ClipsyndicateIE
 from .cloudy import CloudyIE
 from .clubic import ClubicIE

+from .clyp import ClypIE

 from .cmt import CMTIE
 from .cnet import CNETIE
 from .cnn import (
 from .cmt import CMTIE
 from .cnet import CNETIE
 from .cnn import (


@@ -91,6 +132,7 @@ from .comcarcoff import ComCarCoffIE
 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
 from .condenast import CondeNastIE
 from .cracked import CrackedIE
 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
 from .condenast import CondeNastIE
 from .cracked import CrackedIE

+from .crackle import CrackleIE

 from .criterion import CriterionIE
 from .crooksandliars import CrooksAndLiarsIE
 from .crunchyroll import (
 from .criterion import CriterionIE
 from .crooksandliars import CrooksAndLiarsIE
 from .crunchyroll import (


@@ -99,19 +141,39 @@ from .crunchyroll import (
 )
 from .cspan import CSpanIE
 from .ctsnews import CtsNewsIE
 )
 from .cspan import CSpanIE
 from .ctsnews import CtsNewsIE

+from .cultureunplugged import CultureUnpluggedIE
+from .cwtv import CWTVIE

 from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,
     DailymotionUserIE,
 from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,
     DailymotionUserIE,

+    DailymotionCloudIE,
+)
+from .daum import (
+    DaumIE,
+    DaumClipIE,
+    DaumPlaylistIE,
+    DaumUserIE,

 )
 )

-from .daum import DaumIE

 from .dbtv import DBTVIE
 from .dbtv import DBTVIE

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

 from .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE
 from .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE

+from .democracynow import DemocracynowIE

 from .dfb import DFBIE
 from .dhm import DHMIE
 from .dotsub import DotsubIE
 from .douyutv import DouyuTVIE
 from .dfb import DFBIE
 from .dhm import DHMIE
 from .dotsub import DotsubIE
 from .douyutv import DouyuTVIE

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

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


@@ -121,7 +183,6 @@ from .dump import DumpIE
 from .dumpert import DumpertIE
 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE
 from .dumpert import DumpertIE
 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE

-from .divxstage import DivxStageIE

 from .dropbox import DropboxIE
 from .eagleplatform import EaglePlatformIE
 from .ebaumsworld import EbaumsWorldIE
 from .dropbox import DropboxIE
 from .eagleplatform import EaglePlatformIE
 from .ebaumsworld import EbaumsWorldIE


@@ -136,34 +197,41 @@ from .ellentv import (
 )
 from .elpais import ElPaisIE
 from .embedly import EmbedlyIE
 )
 from .elpais import ElPaisIE
 from .embedly import EmbedlyIE

-from .empflix import EMPFlixIE

 from .engadget import EngadgetIE
 from .eporner import EpornerIE
 from .eroprofile import EroProfileIE
 from .escapist import EscapistIE
 from .engadget import EngadgetIE
 from .eporner import EpornerIE
 from .eroprofile import EroProfileIE
 from .escapist import EscapistIE

+from .espn import ESPNIE
+from .esri import EsriVideoIE
+from .europa import EuropaIE

 from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE
 from .expotv import ExpoTVIE
 from .extremetube import ExtremeTubeIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE
 from .expotv import ExpoTVIE
 from .extremetube import ExtremeTubeIE

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

 from .faz import FazIE
 from .fc2 import FC2IE
 from .faz import FazIE
 from .fc2 import FC2IE

-from .firedrive import FiredriveIE
+from .fczenit import FczenitIE

 from .firstpost import FirstpostIE
 from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE
 from .firstpost import FirstpostIE
 from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE

-from .fktv import (
-    FKTVIE,
-    FKTVPosteckeIE,
-)
+from .fivetv import FiveTVIE
+from .fktv import FKTVIE

 from .flickr import FlickrIE
 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .fourtube import FourTubeIE
 from .flickr import FlickrIE
 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .fourtube import FourTubeIE

+from .fox import FOXIE

 from .foxgay import FoxgayIE
 from .foxnews import FoxNewsIE
 from .foxsports import FoxSportsIE
 from .foxgay import FoxgayIE
 from .foxnews import FoxNewsIE
 from .foxsports import FoxSportsIE

-from .franceculture import FranceCultureIE
+from .franceculture import (
+    FranceCultureIE,
+    FranceCultureEmissionIE,
+)

 from .franceinter import FranceInterIE
 from .francetv import (
     PluzzIE,
 from .franceinter import FranceInterIE
 from .francetv import (
     PluzzIE,


@@ -175,7 +243,9 @@ from .francetv import (
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 from .freevideo import FreeVideoIE
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 from .freevideo import FreeVideoIE

+from .funimation import FunimationIE

 from .funnyordie import FunnyOrDieIE
 from .funnyordie import FunnyOrDieIE

+from .gameinformer import GameInformerIE

 from .gamekings import GamekingsIE
 from .gameone import (
     GameOneIE,
 from .gamekings import GamekingsIE
 from .gameone import (
     GameOneIE,


@@ -192,14 +262,18 @@ from .gfycat import GfycatIE
 from .giantbomb import GiantBombIE
 from .giga import GigaIE
 from .glide import GlideIE
 from .giantbomb import GiantBombIE
 from .giga import GigaIE
 from .glide import GlideIE

-from .globo import GloboIE
+from .globo import (
+    GloboIE,
+    GloboArticleIE,
+)

 from .godtube import GodTubeIE
 from .goldenmoustache import GoldenMoustacheIE
 from .golem import GolemIE
 from .godtube import GodTubeIE
 from .goldenmoustache import GoldenMoustacheIE
 from .golem import GolemIE

+from .googledrive import GoogleDriveIE

 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE

-from .gorillavid import GorillaVidIE

 from .goshgay import GoshgayIE
 from .goshgay import GoshgayIE

+from .gputechconf import GPUTechConfIE

 from .groupon import GrouponIE
 from .hark import HarkIE
 from .hearthisat import HearThisAtIE
 from .groupon import GrouponIE
 from .hark import HarkIE
 from .hearthisat import HearThisAtIE


@@ -208,60 +282,91 @@ from .hellporno import HellPornoIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .historicfilms import HistoricFilmsIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .historicfilms import HistoricFilmsIE

-from .history import HistoryIE

 from .hitbox import HitboxIE, HitboxLiveIE
 from .hornbunny import HornBunnyIE
 from .hitbox import HitboxIE, HitboxLiveIE
 from .hornbunny import HornBunnyIE

-from .hostingbulk import HostingBulkIE

 from .hotnewhiphop import HotNewHipHopIE
 from .hotnewhiphop import HotNewHipHopIE

+from .hotstar import HotStarIE

 from .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE
 from .huffpost import HuffPostIE
 from .hypem import HypemIE
 from .iconosquare import IconosquareIE
 from .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE
 from .huffpost import HuffPostIE
 from .hypem import HypemIE
 from .iconosquare import IconosquareIE

-from .ign import IGNIE, OneUPIE
+from .ign import (
+    IGNIE,
+    OneUPIE,
+    PCMagIE,
+)

 from .imdb import (
     ImdbIE,
     ImdbListIE
 )
 from .imdb import (
     ImdbIE,
     ImdbListIE
 )

-from .imgur import ImgurIE
+from .imgur import (
+    ImgurIE,
+    ImgurAlbumIE,
+)

 from .ina import InaIE
 from .ina import InaIE

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

 from .infoq import InfoQIE
 from .instagram import InstagramIE, InstagramUserIE
 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE
 from .infoq import InfoQIE
 from .instagram import InstagramIE, InstagramUserIE
 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE

+from .iqiyi import IqiyiIE
+from .ir90tv import Ir90TvIE

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

+from .ivideon import IvideonIE

 from .izlesene import IzleseneIE
 from .jadorecettepub import JadoreCettePubIE
 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 from .izlesene import IzleseneIE
 from .jadorecettepub import JadoreCettePubIE
 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE

-from .jukebox import JukeboxIE
+from .jwplatform import JWPlatformIE

 from .jpopsukitv import JpopsukiIE
 from .kaltura import KalturaIE
 from .kanalplay import KanalPlayIE
 from .kankan import KankanIE
 from .karaoketv import KaraoketvIE
 from .jpopsukitv import JpopsukiIE
 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 .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE
 from .keezmovies import KeezMoviesIE
 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE

+from .konserthusetplay import KonserthusetPlayIE

 from .kontrtube import KontrTubeIE
 from .krasview import KrasViewIE
 from .ku6 import Ku6IE
 from .kontrtube import KontrTubeIE
 from .krasview import KrasViewIE
 from .ku6 import Ku6IE

+from .kuwo import (
+    KuwoIE,
+    KuwoAlbumIE,
+    KuwoChartIE,
+    KuwoSingerIE,
+    KuwoCategoryIE,
+    KuwoMvIE,
+)

 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE
 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE

+from .lecture2go import Lecture2GoIE
+from .lemonde import LemondeIE

 from .letv import (
     LetvIE,
     LetvTvIE,
 from .letv import (
     LetvIE,
     LetvTvIE,

-    LetvPlaylistIE
+    LetvPlaylistIE,
+    LetvCloudIE,

 )
 from .libsyn import LibsynIE
 from .lifenews import (
     LifeNewsIE,
     LifeEmbedIE,
 )
 )
 from .libsyn import LibsynIE
 from .lifenews import (
     LifeNewsIE,
     LifeEmbedIE,
 )

+from .limelight import (
+    LimelightMediaIE,
+    LimelightChannelIE,
+    LimelightChannelListIE,
+)

 from .liveleak import LiveLeakIE
 from .livestream import (
     LivestreamIE,
 from .liveleak import LiveLeakIE
 from .livestream import (
     LivestreamIE,


@@ -269,6 +374,7 @@ from .livestream import (
     LivestreamShortenerIE,
 )
 from .lnkgo import LnkGoIE
     LivestreamShortenerIE,
 )
 from .lnkgo import LnkGoIE

+from .lovehomeporn import LoveHomePornIE

 from .lrt import LRTIE
 from .lynda import (
     LyndaIE,
 from .lrt import LRTIE
 from .lynda import (
     LyndaIE,


@@ -277,9 +383,10 @@ from .lynda import (
 from .m6 import M6IE
 from .macgamestore import MacGameStoreIE
 from .mailru import MailRuIE
 from .m6 import M6IE
 from .macgamestore import MacGameStoreIE
 from .mailru import MailRuIE

+from .makertv import MakerTVIE

 from .malemotion import MalemotionIE
 from .malemotion import MalemotionIE

+from .matchtv import MatchTVIE

 from .mdr import MDRIE
 from .mdr import MDRIE

-from .megavideoz import MegaVideozIE

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


@@ -301,18 +408,19 @@ from .motherless import MotherlessIE
 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 .movshare import MovShareIE

 from .mtv import (
     MTVIE,
     MTVServicesEmbeddedIE,
     MTVIggyIE,
 from .mtv import (
     MTVIE,
     MTVServicesEmbeddedIE,
     MTVIggyIE,

+    MTVDEIE,

 )
 from .muenchentv import MuenchenTVIE
 from .musicplayon import MusicPlayOnIE
 )
 from .muenchentv import MuenchenTVIE
 from .musicplayon import MusicPlayOnIE

-from .musicvault import MusicVaultIE

 from .muzu import MuzuTVIE
 from .muzu import MuzuTVIE

+from .mwave import MwaveIE

 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 .myvidster import MyVidsterIE
 from .nationalgeographic import NationalGeographicIE
 from .myvideo import MyVideoIE
 from .myvidster import MyVidsterIE
 from .nationalgeographic import NationalGeographicIE


@@ -323,23 +431,36 @@ from .nbc import (
     NBCNewsIE,
     NBCSportsIE,
     NBCSportsVPlayerIE,
     NBCNewsIE,
     NBCSportsIE,
     NBCSportsVPlayerIE,

+    MSNBCIE,

 )
 from .ndr import (
     NDRIE,
     NJoyIE,
 )
 from .ndr import (
     NDRIE,
     NJoyIE,

+    NDREmbedBaseIE,
+    NDREmbedIE,
+    NJoyEmbedIE,

 )
 from .ndtv import NDTVIE
 from .netzkino import NetzkinoIE
 from .nerdcubed import NerdCubedFeedIE
 from .nerdist import NerdistIE
 )
 from .ndtv import NDTVIE
 from .netzkino import NetzkinoIE
 from .nerdcubed import NerdCubedFeedIE
 from .nerdist import NerdistIE

+from .neteasemusic import (
+    NetEaseMusicIE,
+    NetEaseMusicAlbumIE,
+    NetEaseMusicSingerIE,
+    NetEaseMusicListIE,
+    NetEaseMusicMvIE,
+    NetEaseMusicProgramIE,
+    NetEaseMusicDjRadioIE,
+)

 from .newgrounds import NewgroundsIE
 from .newstube import NewstubeIE
 from .nextmedia import (
     NextMediaIE,
     NextMediaActionNewsIE,
 from .newgrounds import NewgroundsIE
 from .newstube import NewstubeIE
 from .nextmedia import (
     NextMediaIE,
     NextMediaActionNewsIE,

-    AppleDailyRealtimeNewsIE,
-    AppleDailyAnimationNewsIE
+    AppleDailyIE,

 )
 )

+from .nextmovie import NextMovieIE

 from .nfb import NFBIE
 from .nfl import NFLIE
 from .nhl import (
 from .nfb import NFBIE
 from .nfl import NFLIE
 from .nhl import (


@@ -347,21 +468,40 @@ from .nhl import (
     NHLNewsIE,
     NHLVideocenterIE,
 )
     NHLNewsIE,
     NHLVideocenterIE,
 )

+from .nick import NickIE

 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninegag import NineGagIE
 from .noco import NocoIE
 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE
 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninegag import NineGagIE
 from .noco import NocoIE
 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE

-from .novamov import NovaMovIE
-from .nowness import NownessIE
-from .nowvideo import NowVideoIE
+from .nova import NovaIE
+from .novamov import (
+    NovaMovIE,
+    WholeCloudIE,
+    NowVideoIE,
+    VideoWeedIE,
+    CloudTimeIE,
+)
+from .nowness import (
+    NownessIE,
+    NownessPlaylistIE,
+    NownessSeriesIE,
+)
+from .nowtv import (
+    NowTVIE,
+    NowTVListIE,
+)
+from .noz import NozIE

 from .npo import (
     NPOIE,
     NPOLiveIE,
     NPORadioIE,
     NPORadioFragmentIE,
 from .npo import (
     NPOIE,
     NPOLiveIE,
     NPORadioIE,
     NPORadioFragmentIE,

-    TegenlichtVproIE,
+    SchoolTVIE,
+    VPROIE,
+    WNLIE

 )
 )

+from .npr import NprIE

 from .nrk import (
     NRKIE,
     NRKPlaylistIE,
 from .nrk import (
     NRKIE,
     NRKPlaylistIE,


@@ -376,31 +516,46 @@ from .nytimes import (
 from .nuvid import NuvidIE
 from .odnoklassniki import OdnoklassnikiIE
 from .oktoberfesttv import OktoberfestTVIE
 from .nuvid import NuvidIE
 from .odnoklassniki import OdnoklassnikiIE
 from .oktoberfesttv import OktoberfestTVIE

-from .ooyala import OoyalaIE
-from .openfilm import OpenFilmIE
+from .onionstudios import OnionStudiosIE
+from .ooyala import (
+    OoyalaIE,
+    OoyalaExternalIE,
+)
+from .ora import OraTVIE

 from .orf import (
     ORFTVthekIE,
     ORFOE1IE,
     ORFFM4IE,
     ORFIPTVIE,
 )
 from .orf import (
     ORFTVthekIE,
     ORFOE1IE,
     ORFFM4IE,
     ORFIPTVIE,
 )

+from .pandoratv import PandoraTVIE

 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE
 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE

+from .periscope import PeriscopeIE

 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 .pinkbike import PinkbikeIE

 from .planetaplay import PlanetaPlayIE
 from .pladform import PladformIE
 from .played import PlayedIE
 from .playfm import PlayFMIE
 from .planetaplay import PlanetaPlayIE
 from .pladform import PladformIE
 from .played import PlayedIE
 from .playfm import PlayFMIE

+from .plays import PlaysTVIE
+from .playtvak import PlaytvakIE

 from .playvid import PlayvidIE
 from .playwire import PlaywireIE
 from .playvid import PlayvidIE
 from .playwire import PlaywireIE

+from .pluralsight import (
+    PluralsightIE,
+    PluralsightCourseIE,
+)

 from .podomatic import PodomaticIE
 from .podomatic import PodomaticIE

+from .porn91 import Porn91IE

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

+    PornHubUserVideosIE,

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


@@ -415,6 +570,7 @@ from .qqmusic import (
     QQMusicSingerIE,
     QQMusicAlbumIE,
     QQMusicToplistIE,
     QQMusicSingerIE,
     QQMusicAlbumIE,
     QQMusicToplistIE,

+    QQMusicPlaylistIE,

 )
 from .quickvid import QuickVidIE
 from .r7 import R7IE
 )
 from .quickvid import QuickVidIE
 from .r7 import R7IE


@@ -422,24 +578,31 @@ from .radiode import RadioDeIE
 from .radiojavan import RadioJavanIE
 from .radiobremen import RadioBremenIE
 from .radiofrance import RadioFranceIE
 from .radiojavan import RadioJavanIE
 from .radiobremen import RadioBremenIE
 from .radiofrance import RadioFranceIE

-from .rai import RaiIE
+from .rai import (
+    RaiTVIE,
+    RaiIE,
+)

 from .rbmaradio import RBMARadioIE
 from .rbmaradio import RBMARadioIE

+from .rds import RDSIE

 from .redtube import RedTubeIE
 from .redtube import RedTubeIE

+from .regiotv import RegioTVIE

 from .restudy import RestudyIE
 from .reverbnation import ReverbNationIE
 from .restudy import RestudyIE
 from .reverbnation import ReverbNationIE

+from .revision3 import Revision3IE

 from .ringtv import RingTVIE
 from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtbf import RTBFIE
 from .ringtv import RingTVIE
 from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtbf import RTBFIE

-from .rte import RteIE
+from .rte import RteIE, RteRadioIE

 from .rtlnl import RtlNlIE
 from .rtlnl import RtlNlIE

-from .rtlnow import RTLnowIE

 from .rtl2 import RTL2IE
 from .rtp import RTPIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE
 from .rtl2 import RTL2IE
 from .rtp import RTPIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE

+from .rtvnh import RTVNHIE

 from .ruhd import RUHDIE
 from .ruhd import RUHDIE

+from .ruleporn import RulePornIE

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


@@ -448,6 +611,7 @@ from .rutube import (
     RutubePersonIE,
 )
 from .rutv import RUTVIE
     RutubePersonIE,
 )
 from .rutv import RUTVIE

+from .ruutu import RuutuIE

 from .sandia import SandiaIE
 from .safari import (
     SafariIE,
 from .sandia import SandiaIE
 from .safari import (
     SafariIE,


@@ -459,14 +623,20 @@ from .sbs import SBSIE
 from .scivee import SciVeeIE
 from .screencast import ScreencastIE
 from .screencastomatic import ScreencastOMaticIE
 from .scivee import SciVeeIE
 from .screencast import ScreencastIE
 from .screencastomatic import ScreencastOMaticIE

+from .screenjunkies import ScreenJunkiesIE

 from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE
 from .senateisvp import SenateISVPIE
 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .sexykarma import SexyKarmaIE
 from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE
 from .senateisvp import SenateISVPIE
 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .sexykarma import SexyKarmaIE

+from .shahid import ShahidIE

 from .shared import SharedIE
 from .sharesix import ShareSixIE
 from .sina import SinaIE
 from .shared import SharedIE
 from .sharesix import ShareSixIE
 from .sina import SinaIE

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

 from .slideshare import SlideshareIE
 from .slutload import SlutloadIE
 from .smotri import (
 from .slideshare import SlideshareIE
 from .slutload import SlutloadIE
 from .smotri import (


@@ -475,14 +645,18 @@ from .smotri import (
     SmotriUserIE,
     SmotriBroadcastIE,
 )
     SmotriUserIE,
     SmotriBroadcastIE,
 )

+from .snagfilms import (
+    SnagFilmsIE,
+    SnagFilmsEmbedIE,
+)

 from .snotr import SnotrIE
 from .snotr import SnotrIE

-from .sockshare import SockshareIE

 from .sohu import SohuIE
 from .soundcloud import (
     SoundcloudIE,
     SoundcloudSetIE,
     SoundcloudUserIE,
 from .sohu import SohuIE
 from .soundcloud import (
     SoundcloudIE,
     SoundcloudSetIE,
     SoundcloudUserIE,

-    SoundcloudPlaylistIE
+    SoundcloudPlaylistIE,
+    SoundcloudSearchIE

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


@@ -501,10 +675,17 @@ from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE, SpiegelArticleIE
 from .spiegeltv import SpiegeltvIE
 from .spike import SpikeIE
 from .spiegel import SpiegelIE, SpiegelArticleIE
 from .spiegeltv import SpiegeltvIE
 from .spike import SpikeIE

+from .stitcher import StitcherIE

 from .sport5 import Sport5IE
 from .sport5 import Sport5IE

-from .sportbox import SportBoxIE
+from .sportbox import (
+    SportBoxIE,
+    SportBoxEmbedIE,
+)

 from .sportdeutschland import SportDeutschlandIE
 from .sportdeutschland import SportDeutschlandIE

-from .srf import SrfIE
+from .srgssr import (
+    SRGSSRIE,
+    SRGSSRPlayIE,
+)

 from .srmediathek import SRMediathekIE
 from .ssa import SSAIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .srmediathek import SRMediathekIE
 from .ssa import SSAIE
 from .stanfordoc import StanfordOpenClassroomIE


@@ -531,25 +712,36 @@ from .teachingchannel import TeachingChannelIE
 from .teamcoco import TeamcocoIE
 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .teamcoco import TeamcocoIE
 from .techtalks import TechTalksIE
 from .ted import TEDIE

+from .tele13 import Tele13IE

 from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE
 from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE

+from .telegraaf import TelegraafIE

 from .telemb import TeleMBIE
 from .teletask import TeleTaskIE
 from .tenplay import TenPlayIE
 from .testurl import TestURLIE
 from .telemb import TeleMBIE
 from .teletask import TeleTaskIE
 from .tenplay import TenPlayIE
 from .testurl import TestURLIE

-from .testtube import TestTubeIE

 from .tf1 import TF1IE
 from .tf1 import TF1IE

+from .theintercept import TheInterceptIE

 from .theonion import TheOnionIE
 from .theonion import TheOnionIE

-from .theplatform import ThePlatformIE
+from .theplatform import (
+    ThePlatformIE,
+    ThePlatformFeedIE,
+)

 from .thesixtyone import TheSixtyOneIE
 from .thesixtyone import TheSixtyOneIE

+from .thisamericanlife import ThisAmericanLifeIE

 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE
 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE

-from .tlc import TlcIE, TlcDeIE
+from .tlc import TlcDeIE

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

-from .tnaflix import TNAFlixIE
+from .tnaflix import (
+    TNAFlixIE,
+    EMPFlixIE,
+    MovieFapIE,
+)
+from .toggle import ToggleIE

 from .thvideo import (
     THVideoIE,
     THVideoPlaylistIE
 from .thvideo import (
     THVideoIE,
     THVideoPlaylistIE


@@ -558,19 +750,41 @@ 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 .trollvids import TrollvidsIE

 from .trutube import TruTubeIE
 from .tube8 import Tube8IE
 from .trutube import TruTubeIE
 from .tube8 import Tube8IE

-from .tudou import TudouIE
+from .tubitv import TubiTvIE
+from .tudou import (
+    TudouIE,
+    TudouPlaylistIE,
+    TudouAlbumIE,
+)

 from .tumblr import TumblrIE
 from .tumblr import TumblrIE

-from .tunein import TuneInIE
+from .tunein import (
+    TuneInClipIE,
+    TuneInStationIE,
+    TuneInProgramIE,
+    TuneInTopicIE,
+    TuneInShortenerIE,
+)

 from .turbo import TurboIE
 from .tutv import TutvIE
 from .turbo import TurboIE
 from .tutv import TutvIE

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

 from .tv4 import TV4IE
 from .tv4 import TV4IE

+from .tvc import (
+    TVCIE,
+    TVCArticleIE,
+)

 from .tvigle import TvigleIE
 from .tvigle import TvigleIE

+from .tvland import TVLandIE

 from .tvp import TvpIE, TvpSeriesIE
 from .tvplay import TVPlayIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE
 from .tvp import TvpIE, TvpSeriesIE
 from .tvplay import TVPlayIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE

+from .twentymin import TwentyMinutenIE

 from .twentytwotracks import (
     TwentyTwoTracksIE,
     TwentyTwoTracksGenreIE
 from .twentytwotracks import (
     TwentyTwoTracksIE,
     TwentyTwoTracksGenreIE


@@ -584,13 +798,18 @@ from .twitch import (
     TwitchBookmarksIE,
     TwitchStreamIE,
 )
     TwitchBookmarksIE,
     TwitchStreamIE,
 )

+from .twitter import (
+    TwitterCardIE,
+    TwitterIE,
+    TwitterAmplifyIE,
+)

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

-from .ultimedia import UltimediaIE
+from .digiteka import DigitekaIE

 from .unistra import UnistraIE
 from .urort import UrortIE
 from .ustream import UstreamIE, UstreamChannelIE
 from .unistra import UnistraIE
 from .urort import UrortIE
 from .ustream import UstreamIE, UstreamChannelIE


@@ -609,18 +828,25 @@ from .vgtv import (
 from .vh1 import VH1IE
 from .vice import ViceIE
 from .viddler import ViddlerIE
 from .vh1 import VH1IE
 from .vice import ViceIE
 from .viddler import ViddlerIE

-from .videobam import VideoBamIE

 from .videodetective import VideoDetectiveIE
 from .videodetective import VideoDetectiveIE

-from .videolecturesnet import VideoLecturesNetIE

 from .videofyme import VideofyMeIE
 from .videomega import VideoMegaIE
 from .videofyme import VideofyMeIE
 from .videomega import VideoMegaIE

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

 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE

-from .videoweed import VideoWeedIE
-from .vidme import VidmeIE
+from .vidme import (
+    VidmeIE,
+    VidmeUserIE,
+    VidmeUserLikesIE,
+)

 from .vidzi import VidziIE
 from .vier import VierIE, VierVideosIE
 from .viewster import ViewsterIE
 from .vidzi import VidziIE
 from .vier import VierIE, VierVideosIE
 from .viewster import ViewsterIE

+from .viidea import ViideaIE

 from .vimeo import (
     VimeoIE,
     VimeoAlbumIE,
 from .vimeo import (
     VimeoIE,
     VimeoAlbumIE,


@@ -636,11 +862,15 @@ from .vine import (
     VineIE,
     VineUserIE,
 )
     VineIE,
     VineUserIE,
 )

-from .viki import VikiIE
+from .viki import (
+    VikiIE,
+    VikiChannelIE,
+)

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

+from .vlive import VLiveIE

 from .vodlocker import VodlockerIE
 from .voicerepublic import VoiceRepublicIE
 from .vporn import VpornIE
 from .vodlocker import VodlockerIE
 from .voicerepublic import VoiceRepublicIE
 from .vporn import VpornIE


@@ -657,8 +887,12 @@ from .wdr import (
     WDRMobileIE,
     WDRMausIE,
 )
     WDRMobileIE,
     WDRMausIE,
 )

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

 from .weibo import WeiboIE
 from .weibo import WeiboIE

+from .weiqitv import WeiqiTVIE

 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE


@@ -666,7 +900,11 @@ from .wrzuta import WrzutaIE
 from .wsj import WSJIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .wsj import WSJIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE

-from .xhamster import XHamsterIE
+from .xfileshare import XFileShareIE
+from .xhamster import (
+    XHamsterIE,
+    XHamsterEmbedIE,
+)

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


@@ -685,6 +923,7 @@ from .yandexmusic import (
     YandexMusicPlaylistIE,
 )
 from .yesjapan import YesJapanIE
     YandexMusicPlaylistIE,
 )
 from .yesjapan import YesJapanIE

+from .yinyuetai import YinYueTaiIE

 from .ynet import YnetIE
 from .youjizz import YouJizzIE
 from .youku import YoukuIE
 from .ynet import YnetIE
 from .youjizz import YouJizzIE
 from .youku import YoukuIE


@@ -705,6 +944,7 @@ from .youtube import (
     YoutubeTruncatedIDIE,
     YoutubeTruncatedURLIE,
     YoutubeUserIE,
     YoutubeTruncatedIDIE,
     YoutubeTruncatedURLIE,
     YoutubeUserIE,

+    YoutubePlaylistsIE,

     YoutubeWatchLaterIE,
 )
 from .zapiks import ZapiksIE
     YoutubeWatchLaterIE,
 )
 from .zapiks import ZapiksIE


@@ -713,6 +953,7 @@ from .zingmp3 import (
     ZingMp3SongIE,
     ZingMp3AlbumIE,
 )
     ZingMp3SongIE,
     ZingMp3AlbumIE,
 )

+from .zippcast import ZippCastIE

 
 _ALL_CLASSES = [
     klass
 
 _ALL_CLASSES = [
     klass