Ack NMU.

[youtubedl] / youtube_dl / extractor / __init__.py

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 0902eb4374caf943e1af4e23aeb7c74a8386a794..1ae606f1eaaa669f71ad3d3c24b7b222545a0520 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -1,67 +1,123 @@
 from __future__ import unicode_literals
 
 from .abc import ABCIE
 from __future__ import unicode_literals
 
 from .abc import ABCIE

+from .abc7news import Abc7NewsIE

 from .academicearth import AcademicEarthCourseIE
 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 .aenetworks import AENetworksIE

 from .aftonbladet import AftonbladetIE
 from .aftonbladet import AftonbladetIE

+from .airmozilla import AirMozillaIE

 from .aljazeera import AlJazeeraIE
 from .alphaporno import AlphaPornoIE
 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 .auengine import AUEngineIE
-from .azubu import AzubuIE
+from .azubu import AzubuIE, AzubuLiveIE
+from .baidu import BaiduVideoIE

 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 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 .beeg import BeegIE
 from .behindkink import BehindKinkIE

+from .beatportpro import BeatportProIE

 from .bet import BetIE
 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

-from .canal13cl import Canal13clIE
+from .camdemy import (
+    CamdemyIE,
+    CamdemyFolderIE
+)

 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 .ceskatelevize import CeskaTelevizeIE
 from .channel9 import Channel9IE

+from .chaturbate import ChaturbateIE

 from .chilloutzone import ChilloutzoneIE
 from .chilloutzone import ChilloutzoneIE

+from .chirbit import (
+    ChirbitIE,
+    ChirbitProfileIE,
+)

 from .cinchcast import CinchcastIE
 from .cinchcast import CinchcastIE

+from .cinemassacre import CinemassacreIE

 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .clipsyndicate import ClipsyndicateIE
 from .cloudy import CloudyIE
 from .clubic import ClubicIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 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 (


@@ -73,35 +129,62 @@ from .collegehumor import CollegeHumorIE
 from .collegerama import CollegeRamaIE
 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
 from .comcarcoff import ComCarCoffIE
 from .collegerama import CollegeRamaIE
 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
 from .comcarcoff import ComCarCoffIE

-from .commonmistakes import CommonMistakesIE
+from .commonmistakes import CommonMistakesIE, UnicodeBOMIE

 from .condenast import CondeNastIE
 from .cracked import CrackedIE
 from .condenast import CondeNastIE
 from .cracked import CrackedIE

+from .crackle import CrackleIE

 from .criterion import CriterionIE
 from .criterion import CriterionIE

+from .crooksandliars import CrooksAndLiarsIE

 from .crunchyroll import (
     CrunchyrollIE,
     CrunchyrollShowPlaylistIE
 )
 from .cspan import CSpanIE
 from .crunchyroll import (
     CrunchyrollIE,
     CrunchyrollShowPlaylistIE
 )
 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 .deezer import DeezerPlaylistIE

+from .democracynow import DemocracynowIE

 from .dfb import DFBIE
 from .dfb import DFBIE

+from .dhm import DHMIE

 from .dotsub import DotsubIE
 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 .drtv import DRTVIE
 from .dvtv import DVTVIE
 from .dump import DumpIE
 from .dreisat import DreiSatIE
 from .drbonanza import DRBonanzaIE
 from .drtuber import DrTuberIE
 from .drtv import DRTVIE
 from .dvtv import DVTVIE
 from .dump import DumpIE

+from .dumpert import DumpertIE

 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE
 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE

-from .divxstage import DivxStageIE

 from .dropbox import DropboxIE
 from .dropbox import DropboxIE

+from .eagleplatform import EaglePlatformIE

 from .ebaumsworld import EbaumsWorldIE
 from .echomsk import EchoMskIE
 from .ehow import EHowIE
 from .ebaumsworld import EbaumsWorldIE
 from .echomsk import EchoMskIE
 from .ehow import EHowIE


@@ -113,32 +196,42 @@ from .ellentv import (
     EllenTVClipsIE,
 )
 from .elpais import ElPaisIE
     EllenTVClipsIE,
 )
 from .elpais import ElPaisIE

-from .empflix import EMPFlixIE
+from .embedly import EmbedlyIE

 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 .flickr import FlickrIE
 from .folketinget import FolketingetIE

+from .footyroom import FootyRoomIE

 from .fourtube import FourTubeIE
 from .fourtube import FourTubeIE

+from .fox import FOXIE

 from .foxgay import FoxgayIE
 from .foxnews import FoxNewsIE
 from .foxgay import FoxgayIE
 from .foxnews import FoxNewsIE

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

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


@@ -150,76 +243,130 @@ 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,
     GameOnePlaylistIE,
 )
 from .gamekings import GamekingsIE
 from .gameone import (
     GameOneIE,
     GameOnePlaylistIE,
 )

+from .gamersyde import GamersydeIE

 from .gamespot import GameSpotIE
 from .gamestar import GameStarIE
 from .gametrailers import GametrailersIE
 from .gamespot import GameSpotIE
 from .gamestar import GameStarIE
 from .gametrailers import GametrailersIE

+from .gazeta import GazetaIE

 from .gdcvault import GDCVaultIE
 from .generic import GenericIE
 from .gdcvault import GDCVaultIE
 from .generic import GenericIE

+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 .grooveshark import GroovesharkIE
+from .gputechconf import GPUTechConfIE

 from .groupon import GrouponIE
 from .hark import HarkIE
 from .groupon import GrouponIE
 from .hark import HarkIE

+from .hearthisat import HearThisAtIE

 from .heise import HeiseIE
 from .hellporno import HellPornoIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .heise import HeiseIE
 from .hellporno import HellPornoIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE

+from .historicfilms import HistoricFilmsIE

 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,
+    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 .jpopsukitv import JpopsukiIE

+from .kaltura import KalturaIE
+from .kanalplay import KanalPlayIE

 from .kankan import KankanIE
 from .karaoketv import KaraoketvIE
 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 .lifenews import LifeNewsIE
+from .lecture2go import Lecture2GoIE
+from .lemonde import LemondeIE
+from .letv import (
+    LetvIE,
+    LetvTvIE,
+    LetvPlaylistIE,
+    LetvCloudIE,
+)
+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,


@@ -227,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,


@@ -235,13 +383,16 @@ 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 .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mgoon import MgoonIE
 from .minhateca import MinhatecaIE
 from .ministrygrid import MinistryGridIE
 from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mgoon import MgoonIE
 from .minhateca import MinhatecaIE
 from .ministrygrid import MinistryGridIE

+from .miomio import MioMioIE

 from .mit import TechTVMITIE, MITIE, OCWMITIE
 from .mitele import MiTeleIE
 from .mixcloud import MixcloudIE
 from .mit import TechTVMITIE, MITIE, OCWMITIE
 from .mitele import MiTeleIE
 from .mixcloud import MixcloudIE


@@ -257,101 +408,201 @@ 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 .myvideo import MyVideoIE
 from .myvidster import MyVidsterIE

+from .nationalgeographic import NationalGeographicIE

 from .naver import NaverIE
 from .nba import NBAIE
 from .nbc import (
     NBCIE,
     NBCNewsIE,
 from .naver import NaverIE
 from .nba import NBAIE
 from .nbc import (
     NBCIE,
     NBCNewsIE,

+    NBCSportsIE,
+    NBCSportsVPlayerIE,
+    MSNBCIE,
+)
+from .ndr import (
+    NDRIE,
+    NJoyIE,
+    NDREmbedBaseIE,
+    NDREmbedIE,
+    NJoyEmbedIE,

 )
 )

-from .ndr import NDRIE

 from .ndtv import NDTVIE
 from .netzkino import NetzkinoIE
 from .nerdcubed import NerdCubedFeedIE
 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 .newgrounds import NewgroundsIE
 from .newstube import NewstubeIE

+from .nextmedia import (
+    NextMediaIE,
+    NextMediaActionNewsIE,
+    AppleDailyIE,
+)
+from .nextmovie import NextMovieIE

 from .nfb import NFBIE
 from .nfl import NFLIE
 from .nfb import NFBIE
 from .nfl import NFLIE

-from .nhl import NHLIE, NHLVideocenterIE
+from .nhl import (
+    NHLIE,
+    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,
 from .npo import (
     NPOIE,
     NPOLiveIE,

-    TegenlichtVproIE,
+    NPORadioIE,
+    NPORadioFragmentIE,
+    SchoolTVIE,
+    VPROIE,
+    WNLIE

 )
 )

+from .npr import NprIE

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

+    NRKPlaylistIE,

     NRKTVIE,
 )
     NRKTVIE,
 )

-from .ntv import NTVIE
-from .nytimes import NYTimesIE
+from .ntvde import NTVDeIE
+from .ntvru import NTVRuIE
+from .nytimes import (
+    NYTimesIE,
+    NYTimesArticleIE,
+)

 from .nuvid import NuvidIE
 from .nuvid import NuvidIE

+from .odnoklassniki import OdnoklassnikiIE

 from .oktoberfesttv import OktoberfestTVIE
 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,
 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 .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE

+from .pinkbike import PinkbikeIE

 from .planetaplay import PlanetaPlayIE
 from .planetaplay import PlanetaPlayIE

+from .pladform import PladformIE

 from .played import PlayedIE
 from .playfm import PlayFMIE
 from .played import PlayedIE
 from .playfm import PlayFMIE

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

 from .playvid import PlayvidIE
 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 .pornhd import PornHdIE

-from .pornhub import PornHubIE
+from .pornhub import (
+    PornHubIE,
+    PornHubPlaylistIE,
+    PornHubUserVideosIE,
+)

 from .pornotube import PornotubeIE
 from .pornotube import PornotubeIE

+from .pornovoisines import PornoVoisinesIE

 from .pornoxo import PornoXOIE
 from .pornoxo import PornoXOIE

+from .primesharetv import PrimeShareTVIE

 from .promptfile import PromptFileIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .promptfile import PromptFileIE
 from .prosiebensat1 import ProSiebenSat1IE

+from .puls4 import Puls4IE

 from .pyvideo import PyvideoIE
 from .pyvideo import PyvideoIE

+from .qqmusic import (
+    QQMusicIE,
+    QQMusicSingerIE,
+    QQMusicAlbumIE,
+    QQMusicToplistIE,
+    QQMusicPlaylistIE,
+)

 from .quickvid import QuickVidIE
 from .quickvid import QuickVidIE

+from .r7 import R7IE

 from .radiode import RadioDeIE
 from .radiode import RadioDeIE

+from .radiojavan import RadioJavanIE

 from .radiobremen import RadioBremenIE
 from .radiofrance import RadioFranceIE
 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 .rtlnl import RtlXlIE
-from .rtlnow import RTLnowIE
+from .rte import RteIE, RteRadioIE
+from .rtlnl import RtlNlIE
+from .rtl2 import RTL2IE

 from .rtp import RTPIE
 from .rts import RTSIE
 from .rtp import RTPIE
 from .rts import RTSIE

-from .rtve import RTVEALaCartaIE, RTVELiveIE
+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,


@@ -360,19 +611,32 @@ 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,
+    SafariCourseIE,
+)

 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 .sapo import SapoIE
 from .savefrom import SaveFromIE
 from .sbs import SBSIE
 from .scivee import SciVeeIE
 from .screencast import ScreencastIE
 from .screencastomatic import ScreencastOMaticIE

-from .screenwavemedia import CinemassacreIE, ScreenwaveMediaIE, TeamFourIE
+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 .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 (


@@ -381,34 +645,59 @@ 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,
+    SoundgasmProfileIE

 )
 )

-from .soundgasm import SoundgasmIE

 from .southpark import (
     SouthParkIE,
 from .southpark import (
     SouthParkIE,

-    SouthparkDeIE,
+    SouthParkDeIE,
+    SouthParkDkIE,
+    SouthParkEsIE,
+    SouthParkNlIE

 )
 from .space import SpaceIE
 )
 from .space import SpaceIE

+from .spankbang import SpankBangIE

 from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE, SpiegelArticleIE
 from .spiegeltv import SpiegeltvIE
 from .spike import SpikeIE
 from .spankwire import SpankwireIE
 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 .srgssr import (
+    SRGSSRIE,
+    SRGSSRPlayIE,
+)

 from .srmediathek import SRMediathekIE
 from .srmediathek import SRMediathekIE

+from .ssa import SSAIE

 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE

+from .streetvoice import StreetVoiceIE

 from .sunporno import SunPornoIE
 from .sunporno import SunPornoIE

+from .svt import (
+    SVTIE,
+    SVTPlayIE,
+)

 from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE
 from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE


@@ -423,21 +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 .tf1 import TF1IE
 from .telemb import TeleMBIE
 from .teletask import TeleTaskIE
 from .tenplay import TenPlayIE
 from .testurl import TestURLIE
 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 .tmz import TMZIE
-from .tnaflix import TNAFlixIE
+from .tlc import TlcDeIE
+from .tmz import (
+    TMZIE,
+    TMZArticleIE,
+)
+from .tnaflix import (
+    TNAFlixIE,
+    EMPFlixIE,
+    MovieFapIE,
+)
+from .toggle import ToggleIE

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


@@ -446,46 +750,103 @@ 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 .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 .tvp import TvpIE, TvpSeriesIE
 from .tvplay import TVPlayIE

+from .tweakers import TweakersIE

 from .twentyfourvideo import TwentyFourVideoIE
 from .twentyfourvideo import TwentyFourVideoIE

-from .twitch import TwitchIE
+from .twentymin import TwentyMinutenIE
+from .twentytwotracks import (
+    TwentyTwoTracksIE,
+    TwentyTwoTracksGenreIE
+)
+from .twitch import (
+    TwitchVideoIE,
+    TwitchChapterIE,
+    TwitchVodIE,
+    TwitchProfileIE,
+    TwitchPastBroadcastsIE,
+    TwitchBookmarksIE,
+    TwitchStreamIE,
+)
+from .twitter import (
+    TwitterCardIE,
+    TwitterIE,
+    TwitterAmplifyIE,
+)

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

+from .udn import UDNEmbedIE
+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

+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

-from .vgtv import VGTVIE
+from .vgtv import (
+    BTArticleIE,
+    BTVestlendingenIE,
+    VGTVIE,
+)

 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 .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,


@@ -501,12 +862,17 @@ 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 .vodlocker import VodlockerIE

+from .voicerepublic import VoiceRepublicIE

 from .vporn import VpornIE
 from .vrt import VRTIE
 from .vube import VubeIE
 from .vporn import VpornIE
 from .vrt import VRTIE
 from .vube import VubeIE


@@ -521,25 +887,43 @@ 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 .wrzuta import WrzutaIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .wrzuta import WrzutaIE

+from .wsj import WSJIE

 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 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 .xminus import XMinusIE
 from .xnxx import XNXXIE

-from .xvideos import XVideosIE
+from .xstream import XstreamIE

 from .xtube import XTubeUserIE, XTubeIE
 from .xtube import XTubeUserIE, XTubeIE

+from .xuite import XuiteIE
+from .xvideos import XVideosIE

 from .xxxymovies import XXXYMoviesIE
 from .yahoo import (
     YahooIE,
     YahooSearchIE,
 )
 from .xxxymovies import XXXYMoviesIE
 from .yahoo import (
     YahooIE,
     YahooSearchIE,
 )

+from .yam import YamIE
+from .yandexmusic import (
+    YandexMusicTrackIE,
+    YandexMusicAlbumIE,
+    YandexMusicPlaylistIE,
+)

 from .yesjapan import YesJapanIE
 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


@@ -560,13 +944,16 @@ from .youtube import (
     YoutubeTruncatedIDIE,
     YoutubeTruncatedURLIE,
     YoutubeUserIE,
     YoutubeTruncatedIDIE,
     YoutubeTruncatedURLIE,
     YoutubeUserIE,

+    YoutubePlaylistsIE,

     YoutubeWatchLaterIE,
 )
     YoutubeWatchLaterIE,
 )

+from .zapiks import ZapiksIE

 from .zdf import ZDFIE, ZDFChannelIE
 from .zingmp3 import (
     ZingMp3SongIE,
     ZingMp3AlbumIE,
 )
 from .zdf import ZDFIE, ZDFChannelIE
 from .zingmp3 import (
     ZingMp3SongIE,
     ZingMp3AlbumIE,
 )

+from .zippcast import ZippCastIE

 
 _ALL_CLASSES = [
     klass
 
 _ALL_CLASSES = [
     klass