Prepare for upload.

[youtubedl] / youtube_dl / extractor / extractors.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 6fc5a18f502a39fd6fc3e0561fa3b6f93cf575d2..83a170fa708aa1c745f5abe9f095fba25a4e71e4 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -1,12 +1,18 @@
 # 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,
 from .academicearth import AcademicEarthCourseIE
 from .acast import (
     ACastIE,


@@ -20,19 +26,22 @@ from .adobetv import (
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE

-from .aenetworks import AENetworksIE
-from .afreecatv import AfreecaTVIE
-from .aftonbladet import AftonbladetIE
+from .aenetworks import (
+    AENetworksIE,
+    HistoryTopicIE,
+)
+from .afreecatv import (
+    AfreecaTVIE,
+    AfreecaTVGlobalIE,
+)

 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 .animeondemand import AnimeOnDemandIE
 from .anitube import AnitubeIE
 from .anysex import AnySexIE
 from .animeondemand import AnimeOnDemandIE
 from .anitube import AnitubeIE
 from .anysex import AnySexIE

-from .aol import (
-    AolIE,
-    AolFeaturesIE,
-)
+from .aol import AolIE

 from .allocine import AllocineIE
 from .aparat import AparatIE
 from .appleconnect import AppleConnectIE
 from .allocine import AllocineIE
 from .aparat import AparatIE
 from .appleconnect import AppleConnectIE


@@ -41,6 +50,7 @@ from .appletrailers import (
     AppleTrailersSectionIE,
 )
 from .archiveorg import ArchiveOrgIE
     AppleTrailersSectionIE,
 )
 from .archiveorg import ArchiveOrgIE

+from .arkena import ArkenaIE

 from .ard import (
     ARDIE,
     ARDMediathekIE,
 from .ard import (
     ARDIE,
     ARDMediathekIE,


@@ -56,6 +66,7 @@ from .arte import (
     ArteTVDDCIE,
     ArteTVMagazineIE,
     ArteTVEmbedIE,
     ArteTVDDCIE,
     ArteTVMagazineIE,
     ArteTVEmbedIE,

+    TheOperaPlatformIE,

     ArteTVPlaylistIE,
 )
 from .atresplayer import AtresPlayerIE
     ArteTVPlaylistIE,
 )
 from .atresplayer import AtresPlayerIE


@@ -63,6 +74,16 @@ from .atttechchannel import ATTTechChannelIE
 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 .awaan import (
+    AWAANIE,
+    AWAANVideoIE,
+    AWAANLiveIE,
+    AWAANSeasonIE,
+)
+from .azmedien import (
+    AZMedienIE,
+    AZMedienPlaylistIE,
+)

 from .azubu import AzubuIE, AzubuLiveIE
 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .azubu import AzubuIE, AzubuLiveIE
 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE


@@ -74,13 +95,18 @@ from .bbc import (
     BBCCoUkPlaylistIE,
     BBCIE,
 )
     BBCCoUkPlaylistIE,
     BBCIE,
 )

+from .beampro import BeamProLiveIE

 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 .bigflix import BigflixIE
 from .bild import BildIE
 from .bet import BetIE
 from .bigflix import BigflixIE
 from .bild import BildIE

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

 from .biobiochiletv import BioBioChileTVIE
 from .biqle import BIQLEIE
 from .bleacherreport import (
 from .biobiochiletv import BioBioChileTVIE
 from .biqle import BIQLEIE
 from .bleacherreport import (


@@ -99,7 +125,10 @@ from .brightcove import (
     BrightcoveNewIE,
 )
 from .buzzfeed import BuzzFeedIE
     BrightcoveNewIE,
 )
 from .buzzfeed import BuzzFeedIE

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

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


@@ -113,9 +142,12 @@ from .carambatv import (
     CarambaTVIE,
     CarambaTVPageIE,
 )
     CarambaTVIE,
     CarambaTVPageIE,
 )

+from .cartoonnetwork import CartoonNetworkIE

 from .cbc import (
     CBCIE,
     CBCPlayerIE,
 from .cbc import (
     CBCIE,
     CBCPlayerIE,

+    CBCWatchVideoIE,
+    CBCWatchIE,

 )
 from .cbs import CBSIE
 from .cbslocal import CBSLocalIE
 )
 from .cbs import CBSIE
 from .cbslocal import CBSLocalIE


@@ -126,9 +158,12 @@ from .cbsnews import (
 )
 from .cbssports import CBSSportsIE
 from .ccc import CCCIE
 )
 from .cbssports import CBSSportsIE
 from .ccc import CCCIE

+from .ccma import CCMAIE
+from .cctv import CCTVIE

 from .cda import CDAIE
 from .ceskatelevize import CeskaTelevizeIE
 from .channel9 import Channel9IE
 from .cda import CDAIE
 from .ceskatelevize import CeskaTelevizeIE
 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,9 +171,9 @@ from .chirbit import (
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE

-from .cliprs import ClipRsIE

 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE

+from .cliprs import ClipRsIE

 from .clipsyndicate import ClipsyndicateIE
 from .closertotruth import CloserToTruthIE
 from .cloudy import CloudyIE
 from .clipsyndicate import ClipsyndicateIE
 from .closertotruth import CloserToTruthIE
 from .cloudy import CloudyIE


@@ -153,11 +188,21 @@ from .cnn import (
 )
 from .coub import CoubIE
 from .collegerama import CollegeRamaIE
 )
 from .coub import CoubIE
 from .collegerama import CollegeRamaIE

-from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
+from .comedycentral import (
+    ComedyCentralFullEpisodesIE,
+    ComedyCentralIE,
+    ComedyCentralShortnameIE,
+    ComedyCentralTVIE,
+    ToshIE,
+)

 from .comcarcoff import ComCarCoffIE
 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
 from .comcarcoff import ComCarCoffIE
 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE

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

 from .condenast import CondeNastIE
 from .condenast import CondeNastIE

+from .corus import CorusIE

 from .cracked import CrackedIE
 from .crackle import CrackleIE
 from .criterion import CriterionIE
 from .cracked import CrackedIE
 from .crackle import CrackleIE
 from .criterion import CriterionIE


@@ -168,7 +213,12 @@ 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 (
 from .cwtv import CWTVIE
 from .dailymail import DailyMailIE
 from .dailymotion import (


@@ -184,12 +234,6 @@ 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 .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE
 from .democracynow import DemocracynowIE


@@ -205,11 +249,16 @@ from .dramafever import (
 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 .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
+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,6 +268,7 @@ 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

 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .einthusan import EinthusanIE
 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .einthusan import EinthusanIE


@@ -233,36 +283,51 @@ 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,
+)

 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 .extremetube import ExtremeTubeIE
 from .eyedotv import EyedoTVIE
 from .expotv import ExpoTVIE
 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 .filmon import (
+    FilmOnIE,
+    FilmOnChannelIE,
+)

 from .firstpost import FirstpostIE
 from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE
 from .fivetv import FiveTVIE
 from .fktv import FKTVIE
 from .flickr import FlickrIE
 from .firstpost import FirstpostIE
 from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE
 from .fivetv import FiveTVIE
 from .fktv import FKTVIE
 from .flickr import FlickrIE

+from .flipagram import FlipagramIE

 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .formula1 import Formula1IE
 from .fourtube import FourTubeIE
 from .fox import FOXIE
 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .formula1 import Formula1IE
 from .fourtube import FourTubeIE
 from .fox import FOXIE

+from .fox9 import FOX9IE

 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,
+    FoxNewsInsiderIE,

 )
 )

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

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


@@ -273,11 +338,11 @@ from .francetv import (
 )
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 )
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE

-from .freevideo import FreeVideoIE

 from .funimation import FunimationIE
 from .funnyordie import FunnyOrDieIE
 from .funimation import FunimationIE
 from .funnyordie import FunnyOrDieIE

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

 from .gameinformer import GameInformerIE
 from .gameinformer import GameInformerIE

-from .gamekings import GamekingsIE

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


@@ -285,6 +350,7 @@ from .gameone import (
 from .gamersyde import GamersydeIE
 from .gamespot import GameSpotIE
 from .gamestar import GameStarIE
 from .gamersyde import GamersydeIE
 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 +362,9 @@ from .globo import (
     GloboIE,
     GloboArticleIE,
 )
     GloboIE,
     GloboArticleIE,
 )

+from .go import GoIE

 from .godtube import GodTubeIE
 from .godtv import GodTVIE
 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


@@ -307,19 +373,29 @@ from .goshgay import GoshgayIE
 from .gputechconf import GPUTechConfIE
 from .groupon import GrouponIE
 from .hark import HarkIE
 from .gputechconf import GPUTechConfIE
 from .groupon import GrouponIE
 from .hark import HarkIE

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

 from .hearthisat import HearThisAtIE
 from .heise import HeiseIE
 from .hellporno import HellPornoIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 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 .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 .hotstar import HotStarIE
 from .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE
 from .hornbunny import HornBunnyIE
 from .hotnewhiphop import HotNewHipHopIE
 from .hotstar import HotStarIE
 from .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE

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

 from .huffpost import HuffPostIE
 from .hypem import HypemIE
 from .iconosquare import IconosquareIE
 from .huffpost import HuffPostIE
 from .hypem import HypemIE
 from .iconosquare import IconosquareIE


@@ -337,6 +413,7 @@ from .imgur import (
     ImgurAlbumIE,
 )
 from .ina import InaIE
     ImgurAlbumIE,
 )
 from .ina import InaIE

+from .inc import IncIE

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


@@ -347,22 +424,30 @@ from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE
 from .iqiyi import IqiyiIE
 from .ir90tv import Ir90TvIE
 from .iprima import IPrimaIE
 from .iqiyi import IqiyiIE
 from .ir90tv import Ir90TvIE

+from .itv import ITVIE

 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 .jwplatform import JWPlatformIE
 from .jpopsukitv import JpopsukiIE
 from .kaltura import KalturaIE
 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 from .jwplatform import JWPlatformIE
 from .jpopsukitv import JpopsukiIE
 from .kaltura import KalturaIE

+from .kamcord import KamcordIE

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


@@ -380,9 +465,18 @@ from .kuwo import (
     KuwoMvIE,
 )
 from .la7 import LA7IE
     KuwoMvIE,
 )
 from .la7 import LA7IE

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

 from .learnr import LearnrIE
 from .lecture2go import Lecture2GoIE
 from .learnr import LearnrIE
 from .lecture2go import Lecture2GoIE

+from .lego import LEGOIE

 from .lemonde import LemondeIE
 from .leeco import (
     LeIE,
 from .lemonde import LemondeIE
 from .leeco import (
     LeIE,


@@ -420,12 +514,20 @@ from .macgamestore import MacGameStoreIE
 from .mailru import MailRuIE
 from .makerschannel import MakersChannelIE
 from .makertv import MakerTVIE
 from .mailru import MailRuIE
 from .makerschannel import MakersChannelIE
 from .makertv import MakerTVIE

+from .mangomolo import (
+    MangomoloVideoIE,
+    MangomoloLiveIE,
+)

 from .matchtv import MatchTVIE
 from .mdr import MDRIE
 from .matchtv import MatchTVIE
 from .mdr import MDRIE

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


@@ -454,11 +556,14 @@ 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 .movingimage import MovingImageIE
+from .msn import MSNIE

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

+    MTVVideoIE,

     MTVServicesEmbeddedIE,
     MTVServicesEmbeddedIE,

-    MTVIggyIE,

     MTVDEIE,
     MTVDEIE,

+    MTV81IE,

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


@@ -469,8 +574,9 @@ from .myvi import MyviIE
 from .myvideo import MyVideoIE
 from .myvidster import MyVidsterIE
 from .nationalgeographic import (
 from .myvideo import MyVideoIE
 from .myvidster import MyVidsterIE
 from .nationalgeographic import (

+    NationalGeographicVideoIE,

     NationalGeographicIE,
     NationalGeographicIE,

-    NationalGeographicChannelIE,
+    NationalGeographicEpisodeGuideIE,

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


@@ -478,6 +584,7 @@ from .nbc import (
     CSNNEIE,
     NBCIE,
     NBCNewsIE,
     CSNNEIE,
     NBCIE,
     NBCNewsIE,

+    NBCOlympicsIE,

     NBCSportsIE,
     NBCSportsVPlayerIE,
 )
     NBCSportsIE,
     NBCSportsVPlayerIE,
 )


@@ -506,10 +613,11 @@ from .nextmedia import (
     NextMediaIE,
     NextMediaActionNewsIE,
     AppleDailyIE,
     NextMediaIE,
     NextMediaActionNewsIE,
     AppleDailyIE,

+    NextTVIE,

 )
 )

-from .nextmovie import NextMovieIE

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

+from .nhk import NhkVodIE

 from .nhl import (
     NHLVideocenterIE,
     NHLNewsIE,
 from .nhl import (
     NHLVideocenterIE,
     NHLNewsIE,


@@ -519,9 +627,17 @@ from .nhl import (
 from .nick import (
     NickIE,
     NickDeIE,
 from .nick import (
     NickIE,
     NickDeIE,

+    NickNightIE,

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

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

 from .ninegag import NineGagIE
 from .ninegag import NineGagIE

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

 from .noco import NocoIE
 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE
 from .noco import NocoIE
 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE


@@ -544,13 +660,14 @@ from .nowtv import (
 )
 from .noz import NozIE
 from .npo import (
 )
 from .noz import NozIE
 from .npo import (

+    AndereTijdenIE,

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

-    WNLIE
+    WNLIE,

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


@@ -558,6 +675,9 @@ from .nrk import (
     NRKPlaylistIE,
     NRKSkoleIE,
     NRKTVIE,
     NRKPlaylistIE,
     NRKSkoleIE,
     NRKTVIE,

+    NRKTVDirekteIE,
+    NRKTVEpisodesIE,
+    NRKTVSeriesIE,

 )
 from .ntvde import NTVDeIE
 from .ntvru import NTVRuIE
 )
 from .ntvde import NTVDeIE
 from .ntvru import NTVRuIE


@@ -566,8 +686,17 @@ 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,
 from .onionstudios import OnionStudiosIE
 from .ooyala import (
     OoyalaIE,


@@ -581,6 +710,7 @@ from .orf import (
     ORFFM4IE,
     ORFIPTVIE,
 )
     ORFFM4IE,
     ORFIPTVIE,
 )

+from .pandatv import PandaTVIE

 from .pandoratv import PandoraTVIE
 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pandoratv import PandoraTVIE
 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE


@@ -593,9 +723,9 @@ 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 .piksel import PikselIE

 from .pinkbike import PinkbikeIE
 from .pladform import PladformIE
 from .pinkbike import PinkbikeIE
 from .pladform import PladformIE

-from .played import PlayedIE

 from .playfm import PlayFMIE
 from .plays import PlaysTVIE
 from .playtvak import PlaytvakIE
 from .playfm import PlayFMIE
 from .plays import PlaysTVIE
 from .playtvak import PlaytvakIE


@@ -606,7 +736,14 @@ from .pluralsight import (
     PluralsightCourseIE,
 )
 from .podomatic import PodomaticIE
     PluralsightCourseIE,
 )
 from .podomatic import PodomaticIE

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

 from .porn91 import Porn91IE
 from .porn91 import Porn91IE

+from .porncom import PornComIE
+from .pornflip import PornFlipIE

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


@@ -649,6 +786,10 @@ from .rbmaradio import RBMARadioIE
 from .rds import RDSIE
 from .redtube import RedTubeIE
 from .regiotv import RegioTVIE
 from .rds import RDSIE
 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


@@ -658,18 +799,22 @@ from .revision3 import (
 )
 from .rice import RICEIE
 from .ringtv import RingTVIE
 )
 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 .rtl2 import RTL2IE
 from .rtp import RTPIE
 from .rts import RTSIE
 from .rtbf import RTBFIE
 from .rte import RteIE, RteRadioIE
 from .rtlnl import RtlNlIE
 from .rtl2 import RTL2IE
 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 .rudo import RudoIE

 from .ruhd import RUHDIE
 from .ruleporn import RulePornIE
 from .rutube import (
 from .ruhd import RUHDIE
 from .ruleporn import RulePornIE
 from .rutube import (


@@ -693,21 +838,26 @@ 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 .scrippsnetworks import ScrippsNetworksWatchIE

 from .seeker import SeekerIE
 from .senateisvp import SenateISVPIE
 from .sendtonews import SendtoNewsIE
 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .shahid import ShahidIE
 from .seeker import SeekerIE
 from .senateisvp import SenateISVPIE
 from .sendtonews import SendtoNewsIE
 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .shahid import ShahidIE

-from .shared import SharedIE
-from .sharesix import ShareSixIE
+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 .skysports import SkySportsIE

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


@@ -718,6 +868,7 @@ 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 (
     SoundcloudIE,
     SoundcloudSetIE,
 from .soundcloud import (
     SoundcloudIE,
     SoundcloudSetIE,


@@ -743,20 +894,18 @@ from .spiegeltv import SpiegeltvIE
 from .spike import SpikeIE
 from .stitcher import StitcherIE
 from .sport5 import Sport5IE
 from .spike import SpikeIE
 from .stitcher import StitcherIE
 from .sport5 import Sport5IE

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

 from .sportdeutschland import SportDeutschlandIE
 from .sportschau import SportschauIE
 from .sportdeutschland import SportDeutschlandIE
 from .sportschau import SportschauIE

+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


@@ -772,8 +921,8 @@ from .tagesschau import (
     TagesschauPlayerIE,
     TagesschauIE,
 )
     TagesschauPlayerIE,
     TagesschauIE,
 )

-from .tapely import TapelyIE

 from .tass import TassIE
 from .tass import TassIE

+from .tbs import TBSIE

 from .tdslifeway import TDSLifewayIE
 from .teachertube import (
     TeacherTubeIE,
 from .tdslifeway import TDSLifewayIE
 from .teachertube import (
     TeacherTubeIE,


@@ -781,6 +930,7 @@ from .teachertube import (
 )
 from .teachingchannel import TeachingChannelIE
 from .teamcoco import TeamcocoIE
 )
 from .teachingchannel import TeachingChannelIE
 from .teamcoco import TeamcocoIE

+from .teamfourstar import TeamFourStarIE

 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .tele13 import Tele13IE
 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .tele13 import Tele13IE


@@ -788,10 +938,12 @@ from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE
 from .telegraaf import TelegraafIE
 from .telemb import TeleMBIE
 from .telecinco import TelecincoIE
 from .telegraaf import TelegraafIE
 from .telemb import TeleMBIE

+from .telequebec import TeleQuebecIE

 from .teletask import TeleTaskIE
 from .telewebion import TelewebionIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .teletask import TeleTaskIE
 from .telewebion import TelewebionIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE

+from .tfo import TFOIE

 from .theintercept import TheInterceptIE
 from .theplatform import (
     ThePlatformIE,
 from .theintercept import TheInterceptIE
 from .theplatform import (
     ThePlatformIE,


@@ -800,8 +952,10 @@ from .theplatform import (
 from .thescene import TheSceneIE
 from .thesixtyone import TheSixtyOneIE
 from .thestar import TheStarIE
 from .thescene import TheSceneIE
 from .thesixtyone import TheSixtyOneIE
 from .thestar import TheStarIE

+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 .tinypic import TinyPicIE
 from .tlc import TlcDeIE
 from .threeqsdn import ThreeQSDNIE
 from .tinypic import TinyPicIE
 from .tlc import TlcDeIE


@@ -816,16 +970,12 @@ from .tnaflix import (
     MovieFapIE,
 )
 from .toggle import ToggleIE
     MovieFapIE,
 )
 from .toggle import ToggleIE

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

 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 .trutv import TruTVIE

 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE
 from .tudou import (
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE
 from .tudou import (


@@ -849,17 +999,29 @@ from .tv2 import (
 )
 from .tv3 import TV3IE
 from .tv4 import TV4IE
 )
 from .tv3 import TV3IE
 from .tv4 import TV4IE

+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 .tvnoe import TVNoeIE

 from .tvp import (
 from .tvp import (

+    TVPEmbedIE,

     TVPIE,
     TVPSeriesIE,
 )
     TVPIE,
     TVPSeriesIE,
 )

-from .tvplay import TVPlayIE
+from .tvplay import (
+    TVPlayIE,
+    ViafreeIE,
+)
+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


@@ -872,7 +1034,10 @@ from .twitch import (
     TwitchChapterIE,
     TwitchVodIE,
     TwitchProfileIE,
     TwitchChapterIE,
     TwitchVodIE,
     TwitchProfileIE,

+    TwitchAllVideosIE,
+    TwitchUploadsIE,

     TwitchPastBroadcastsIE,
     TwitchPastBroadcastsIE,

+    TwitchHighlightsIE,

     TwitchStreamIE,
     TwitchClipsIE,
 )
     TwitchStreamIE,
     TwitchClipsIE,
 )


@@ -886,9 +1051,17 @@ from .udemy import (
     UdemyCourseIE
 )
 from .udn import UDNEmbedIE
     UdemyCourseIE
 )
 from .udn import UDNEmbedIE

+from .uktvplay import UKTVPlayIE

 from .digiteka import DigitekaIE
 from .unistra import UnistraIE
 from .digiteka import DigitekaIE
 from .unistra import UnistraIE

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


@@ -915,7 +1088,10 @@ from .vice import (
     ViceIE,
     ViceShowIE,
 )
     ViceIE,
     ViceShowIE,
 )

+from .viceland import VicelandIE
+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 .videomega import VideoMegaIE
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
 from .videomega import VideoMegaIE


@@ -925,7 +1101,7 @@ from .videomore import (
     VideomoreSeasonIE,
 )
 from .videopremium import VideoPremiumIE
     VideomoreSeasonIE,
 )
 from .videopremium import VideoPremiumIE

-from .videott import VideoTtIE
+from .videopress import VideoPressIE

 from .vidio import VidioIE
 from .vidme import (
     VidmeIE,
 from .vidio import VidioIE
 from .vidme import (
     VidmeIE,


@@ -960,18 +1136,32 @@ from .viki import (
     VikiIE,
     VikiChannelIE,
 )
     VikiIE,
     VikiChannelIE,
 )

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

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

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

 )
 )

-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 .voxmedia import VoxMediaIE
 from .vporn import VpornIE
 from .vrt import VRTIE
 from .vube import VubeIE
 from .vuclip import VuClipIE
 from .voicerepublic import VoiceRepublicIE
 from .voxmedia import VoxMediaIE
 from .vporn import VpornIE
 from .vrt import VRTIE
 from .vube import VubeIE
 from .vuclip import VuClipIE

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

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


@@ -983,6 +1173,10 @@ from .wdr import (
     WDRIE,
     WDRMobileIE,
 )
     WDRIE,
     WDRMobileIE,
 )

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

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


@@ -1048,6 +1242,7 @@ from .youtube import (
     YoutubeSearchDateIE,
     YoutubeSearchIE,
     YoutubeSearchURLIE,
     YoutubeSearchDateIE,
     YoutubeSearchIE,
     YoutubeSearchURLIE,

+    YoutubeSharedVideoIE,

     YoutubeShowIE,
     YoutubeSubscriptionsIE,
     YoutubeTruncatedIDIE,
     YoutubeShowIE,
     YoutubeSubscriptionsIE,
     YoutubeTruncatedIDIE,


@@ -1057,8 +1252,4 @@ from .youtube import (
 )
 from .zapiks import ZapiksIE
 from .zdf import ZDFIE, ZDFChannelIE
 )
 from .zapiks import ZapiksIE
 from .zdf import ZDFIE, ZDFChannelIE

-from .zingmp3 import (
-    ZingMp3SongIE,
-    ZingMp3AlbumIE,
-)
-from .zippcast import ZippCastIE
+from .zingmp3 import ZingMp3IE