Merge branch 'vlive' of https://github.com/ping/youtube-dl into ping-vlive

[youtube-dl] / youtube_dl / extractor / __init__.py

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index e38e77a278236a61654410837e2b64798f4b261d..5d2ea39d0abfdc5d83d04e172e87edbdc54de44a 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -158,6 +158,7 @@ from .eporner import EpornerIE
 from .eroprofile import EroProfileIE
 from .escapist import EscapistIE
 from .espn import ESPNIE
 from .eroprofile import EroProfileIE
 from .escapist import EscapistIE
 from .espn import ESPNIE

+from .esri import EsriVideoIE

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


@@ -240,8 +241,15 @@ from .imdb import (
     ImdbIE,
     ImdbListIE
 )
     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 .infoq import InfoQIE
 from .instagram import InstagramIE, InstagramUserIE
 from .internetvideoarchive import InternetVideoArchiveIE


@@ -335,11 +343,13 @@ from .mtv import (
     MTVIE,
     MTVServicesEmbeddedIE,
     MTVIggyIE,
     MTVIE,
     MTVServicesEmbeddedIE,
     MTVIggyIE,

+    MTVDEIE,

 )
 from .muenchentv import MuenchenTVIE
 from .musicplayon import MusicPlayOnIE
 from .musicvault import MusicVaultIE
 from .muzu import MuzuTVIE
 )
 from .muenchentv import MuenchenTVIE
 from .musicplayon import MusicPlayOnIE
 from .musicvault import MusicVaultIE
 from .muzu import MuzuTVIE

+from .mwave import MwaveIE

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


@@ -353,6 +363,7 @@ from .nbc import (
     NBCNewsIE,
     NBCSportsIE,
     NBCSportsVPlayerIE,
     NBCNewsIE,
     NBCSportsIE,
     NBCSportsVPlayerIE,

+    MSNBCIE,

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


@@ -444,8 +455,13 @@ from .planetaplay import PlanetaPlayIE
 from .pladform import PladformIE
 from .played import PlayedIE
 from .playfm import PlayFMIE
 from .pladform import PladformIE
 from .played import PlayedIE
 from .playfm import PlayFMIE

+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 .porn91 import Porn91IE
 from .pornhd import PornHdIE
 from .podomatic import PodomaticIE
 from .porn91 import Porn91IE
 from .pornhd import PornHdIE


@@ -491,6 +507,7 @@ from .rtl2 import RTL2IE
 from .rtp import RTPIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE
 from .rtp import RTPIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE

+from .rtvnh import RTVNHIE

 from .ruhd import RUHDIE
 from .rutube import (
     RutubeIE,
 from .ruhd import RUHDIE
 from .rutube import (
     RutubeIE,


@@ -517,6 +534,7 @@ 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


@@ -596,6 +614,7 @@ from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE
 from .ted import TEDIE
 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 .telemb import TeleMBIE
 from .teletask import TeleTaskIE
 from .tenplay import TenPlayIE


@@ -603,7 +622,10 @@ from .testurl import TestURLIE
 from .testtube import TestTubeIE
 from .tf1 import TF1IE
 from .theonion import TheOnionIE
 from .testtube import TestTubeIE
 from .tf1 import TF1IE
 from .theonion import TheOnionIE

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

 from .thesixtyone import TheSixtyOneIE
 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE
 from .thesixtyone import TheSixtyOneIE
 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE


@@ -687,7 +709,6 @@ 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 .videolecturesnet import VideoLecturesNetIE
 from .videofyme import VideofyMeIE
 from .videodetective import VideoDetectiveIE
 from .videolecturesnet import VideoLecturesNetIE
 from .videofyme import VideofyMeIE


@@ -722,6 +743,7 @@ from .vk import (
     VKIE,
     VKUserVideosIE,
 )
     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