Merge remote-tracking branch 'hojel/empflix'

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 81a81779f849a29d99a3784cd79c4ae644bea6c5..3503c76b7c61515d6b42dae8a7afebdc5cfa6712 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -72,6 +72,7 @@ from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE
 from .elpais import ElPaisIE
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE
 from .elpais import ElPaisIE

+from .empflix import EmpflixIE

 from .engadget import EngadgetIE
 from .escapist import EscapistIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .engadget import EngadgetIE
 from .escapist import EscapistIE
 from .everyonesmixtape import EveryonesMixtapeIE


@@ -79,6 +80,7 @@ from .exfm import ExfmIE
 from .extremetube import ExtremeTubeIE
 from .facebook import FacebookIE
 from .faz import FazIE
 from .extremetube import ExtremeTubeIE
 from .facebook import FacebookIE
 from .faz import FazIE

+from .fc2 import FC2IE

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


@@ -109,10 +111,12 @@ from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .hark import HarkIE
 from .helsinki import HelsinkiIE
 from .googlesearch import GoogleSearchIE
 from .hark import HarkIE
 from .helsinki import HelsinkiIE

+from .hentaistigma import HentaiStigmaIE

 from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE
 from .huffpost import HuffPostIE
 from .hypem import HypemIE
 from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE
 from .huffpost import HuffPostIE
 from .hypem import HypemIE

+from .iconosquare import IconosquareIE

 from .ign import IGNIE, OneUPIE
 from .imdb import (
     ImdbIE,
 from .ign import IGNIE, OneUPIE
 from .imdb import (
     ImdbIE,


@@ -160,6 +164,7 @@ from .mofosex import MofosexIE
 from .mooshare import MooshareIE
 from .morningstar import MorningstarIE
 from .motorsport import MotorsportIE
 from .mooshare import MooshareIE
 from .morningstar import MorningstarIE
 from .motorsport import MotorsportIE

+from .moviezine import MoviezineIE

 from .movshare import MovShareIE
 from .mtv import (
     MTVIE,
 from .movshare import MovShareIE
 from .mtv import (
     MTVIE,


@@ -179,6 +184,7 @@ from .nbc import (
 from .ndr import NDRIE
 from .ndtv import NDTVIE
 from .newgrounds import NewgroundsIE
 from .ndr import NDRIE
 from .ndtv import NDTVIE
 from .newgrounds import NewgroundsIE

+from .newstube import NewstubeIE

 from .nfb import NFBIE
 from .nhl import NHLIE, NHLVideocenterIE
 from .niconico import NiconicoIE
 from .nfb import NFBIE
 from .nhl import NHLIE, NHLVideocenterIE
 from .niconico import NiconicoIE


@@ -188,7 +194,10 @@ from .normalboots import NormalbootsIE
 from .novamov import NovaMovIE
 from .nowness import NownessIE
 from .nowvideo import NowVideoIE
 from .novamov import NovaMovIE
 from .nowness import NownessIE
 from .nowvideo import NowVideoIE

+from .nrk import NRKIE

 from .ntv import NTVIE
 from .ntv import NTVIE

+from .nytimes import NYTimesIE
+from .nuvid import NuvidIE

 from .oe1 import OE1IE
 from .ooyala import OoyalaIE
 from .orf import ORFIE
 from .oe1 import OE1IE
 from .ooyala import OoyalaIE
 from .orf import ORFIE


@@ -209,6 +218,7 @@ from .ringtv import RingTVIE
 from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE

+from .rtbf import RTBFIE

 from .rtlnow import RTLnowIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE
 from .rtlnow import RTLnowIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE


@@ -220,9 +230,11 @@ from .rutube import (
 )
 from .rutv import RUTVIE
 from .savefrom import SaveFromIE
 )
 from .rutv import RUTVIE
 from .savefrom import SaveFromIE

+from .scivee import SciVeeIE

 from .servingsys import ServingSysIE
 from .sina import SinaIE
 from .slideshare import SlideshareIE
 from .servingsys import ServingSysIE
 from .sina import SinaIE
 from .slideshare import SlideshareIE

+from .slutload import SlutloadIE

 from .smotri import (
     SmotriIE,
     SmotriCommunityIE,
 from .smotri import (
     SmotriIE,
     SmotriCommunityIE,


@@ -230,7 +242,12 @@ from .smotri import (
     SmotriBroadcastIE,
 )
 from .sohu import SohuIE
     SmotriBroadcastIE,
 )
 from .sohu import SohuIE

-from .soundcloud import SoundcloudIE, SoundcloudSetIE, SoundcloudUserIE
+from .soundcloud import (
+    SoundcloudIE,
+    SoundcloudSetIE,
+    SoundcloudUserIE,
+    SoundcloudPlaylistIE
+)

 from .southparkstudios import (
     SouthParkStudiosIE,
     SouthparkDeIE,
 from .southparkstudios import (
     SouthParkStudiosIE,
     SouthparkDeIE,


@@ -240,7 +257,6 @@ from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE
 from .spike import SpikeIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .spiegel import SpiegelIE
 from .spike import SpikeIE
 from .stanfordoc import StanfordOpenClassroomIE

-from .statigram import StatigramIE

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


@@ -284,6 +300,7 @@ from .videodetective import VideoDetectiveIE
 from .videolecturesnet import VideoLecturesNetIE
 from .videofyme import VideofyMeIE
 from .videopremium import VideoPremiumIE
 from .videolecturesnet import VideoLecturesNetIE
 from .videofyme import VideofyMeIE
 from .videopremium import VideoPremiumIE

+from .videott import VideoTtIE

 from .videoweed import VideoWeedIE
 from .vimeo import (
     VimeoIE,
 from .videoweed import VideoWeedIE
 from .vimeo import (
     VimeoIE,


@@ -292,8 +309,12 @@ from .vimeo import (
     VimeoAlbumIE,
     VimeoGroupsIE,
     VimeoReviewIE,
     VimeoAlbumIE,
     VimeoGroupsIE,
     VimeoReviewIE,

+    VimeoWatchLaterIE,
+)
+from .vine import (
+    VineIE,
+    VineUserIE,

 )
 )

-from .vine import VineIE

 from .viki import VikiIE
 from .vk import VKIE
 from .vube import VubeIE
 from .viki import VikiIE
 from .vk import VKIE
 from .vube import VubeIE


@@ -302,6 +323,7 @@ from .washingtonpost import WashingtonPostIE
 from .wat import WatIE
 from .wdr import (
     WDRIE,
 from .wat import WatIE
 from .wdr import (
     WDRIE,

+    WDRMobileIE,

     WDRMausIE,
 )
 from .weibo import WeiboIE
     WDRMausIE,
 )
 from .weibo import WeiboIE