Merge branch 'ping-viki-shows'

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 43f3e680829d22d46ec4d4214a0aaff9a46875a6..24efb7ce50e27e371c84d1e85b3b6314f0624026 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -32,6 +32,7 @@ from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE
 from .audiomack import AudiomackIE, AudiomackAlbumIE
 from .azubu import AzubuIE
 from .atttechchannel import ATTTechChannelIE
 from .audiomack import AudiomackIE, AudiomackAlbumIE
 from .azubu import AzubuIE

+from .baidu import BaiduVideoIE

 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .bbccouk import BBCCoUkIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .bbccouk import BBCCoUkIE


@@ -140,6 +141,7 @@ 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 .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE
 from .expotv import ExpoTVIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE
 from .expotv import ExpoTVIE


@@ -257,7 +259,10 @@ from .letv import (
     LetvPlaylistIE
 )
 from .libsyn import LibsynIE
     LetvPlaylistIE
 )
 from .libsyn import LibsynIE

-from .lifenews import LifeNewsIE
+from .lifenews import (
+    LifeNewsIE,
+    LifeEmbedIE,
+)

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


@@ -320,7 +325,10 @@ from .nbc import (
     NBCSportsIE,
     NBCSportsVPlayerIE,
 )
     NBCSportsIE,
     NBCSportsVPlayerIE,
 )

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

 from .ndtv import NDTVIE
 from .netzkino import NetzkinoIE
 from .nerdcubed import NerdCubedFeedIE
 from .ndtv import NDTVIE
 from .netzkino import NetzkinoIE
 from .nerdcubed import NerdCubedFeedIE


@@ -362,11 +370,17 @@ from .nrk import (
 )
 from .ntvde import NTVDeIE
 from .ntvru import NTVRuIE
 )
 from .ntvde import NTVDeIE
 from .ntvru import NTVRuIE

-from .nytimes import NYTimesIE
+from .nytimes import (
+    NYTimesIE,
+    NYTimesArticleIE,
+)

 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 .ooyala import (
+    OoyalaIE,
+    OoyalaExternalIE,
+)

 from .openfilm import OpenFilmIE
 from .orf import (
     ORFTVthekIE,
 from .openfilm import OpenFilmIE
 from .orf import (
     ORFTVthekIE,


@@ -404,6 +418,7 @@ from .qqmusic import (
     QQMusicIE,
     QQMusicSingerIE,
     QQMusicAlbumIE,
     QQMusicIE,
     QQMusicSingerIE,
     QQMusicAlbumIE,

+    QQMusicToplistIE,

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


@@ -479,8 +494,10 @@ from .soundgasm import (
 )
 from .southpark import (
     SouthParkIE,
 )
 from .southpark import (
     SouthParkIE,

+    SouthParkDeIE,
+    SouthParkDkIE,

     SouthParkEsIE,
     SouthParkEsIE,

-    SouthparkDeIE,
+    SouthParkNlIE

 )
 from .space import SpaceIE
 from .spankbang import SpankBangIE
 )
 from .space import SpaceIE
 from .spankbang import SpankBangIE


@@ -489,7 +506,10 @@ from .spiegel import SpiegelIE, SpiegelArticleIE
 from .spiegeltv import SpiegeltvIE
 from .spike import SpikeIE
 from .sport5 import Sport5IE
 from .spiegeltv import SpiegeltvIE
 from .spike import SpikeIE
 from .sport5 import Sport5IE

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

 from .sportdeutschland import SportDeutschlandIE
 from .srf import SrfIE
 from .srmediathek import SRMediathekIE
 from .sportdeutschland import SportDeutschlandIE
 from .srf import SrfIE
 from .srmediathek import SRMediathekIE


@@ -500,7 +520,10 @@ from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 from .streetvoice import StreetVoiceIE
 from .sunporno import SunPornoIE
 from .streamcz import StreamCZIE
 from .streetvoice import StreetVoiceIE
 from .sunporno import SunPornoIE

-from .svtplay import SVTPlayIE
+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


@@ -529,7 +552,10 @@ from .thesixtyone import TheSixtyOneIE
 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE
 from .tlc import TlcIE, TlcDeIE
 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE
 from .tlc import TlcIE, TlcDeIE

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

 from .tnaflix import TNAFlixIE
 from .thvideo import (
     THVideoIE,
 from .tnaflix import TNAFlixIE
 from .thvideo import (
     THVideoIE,


@@ -546,6 +572,10 @@ from .tumblr import TumblrIE
 from .tunein import TuneInIE
 from .turbo import TurboIE
 from .tutv import TutvIE
 from .tunein import TuneInIE
 from .turbo import TurboIE
 from .tutv import TutvIE

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

 from .tv4 import TV4IE
 from .tvigle import TvigleIE
 from .tvp import TvpIE, TvpSeriesIE
 from .tv4 import TV4IE
 from .tvigle import TvigleIE
 from .tvp import TvpIE, TvpSeriesIE


@@ -582,7 +612,11 @@ from .veoh import VeohIE
 from .vessel import VesselIE
 from .vesti import VestiIE
 from .vevo import VevoIE
 from .vessel import VesselIE
 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


@@ -613,12 +647,16 @@ from .vine import (
     VineIE,
     VineUserIE,
 )
     VineIE,
     VineUserIE,
 )

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

 from .vk import (
     VKIE,
     VKUserVideosIE,
 )
 from .vodlocker import VodlockerIE
 from .vk import (
     VKIE,
     VKUserVideosIE,
 )
 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


@@ -645,9 +683,10 @@ from .xboxclips import XboxClipsIE
 from .xhamster import XHamsterIE
 from .xminus import XMinusIE
 from .xnxx import XNXXIE
 from .xhamster import XHamsterIE
 from .xminus import XMinusIE
 from .xnxx import XNXXIE

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

 from .xtube import XTubeUserIE, XTubeIE
 from .xuite import XuiteIE
 from .xtube import XTubeUserIE, XTubeIE
 from .xuite import XuiteIE

+from .xvideos import XVideosIE

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