Merge remote-tracking branch 'hojel/slutload'

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 3a91e1a465a1f7d0dcd2b169d7dc514d41b055c7..5095f14b620839170fbbe264b9810f1dc543ba93 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -20,6 +20,7 @@ from .auengine import AUEngineIE
 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

+from .bilibili import BiliBiliIE

 from .blinkx import BlinkxIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .bloomberg import BloombergIE
 from .blinkx import BlinkxIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .bloomberg import BloombergIE


@@ -40,6 +41,7 @@ from .cinemassacre import CinemassacreIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .clipsyndicate import ClipsyndicateIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .clipsyndicate import ClipsyndicateIE

+from .clubic import ClubicIE

 from .cmt import CMTIE
 from .cnet import CNETIE
 from .cnn import (
 from .cmt import CMTIE
 from .cnet import CNETIE
 from .cnn import (


@@ -77,6 +79,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


@@ -111,6 +114,7 @@ from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE
 from .huffpost import HuffPostIE
 from .hypem import HypemIE
 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,


@@ -158,6 +162,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,


@@ -177,15 +182,19 @@ 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 .ninegag import NineGagIE
 from .nfb import NFBIE
 from .nhl import NHLIE, NHLVideocenterIE
 from .niconico import NiconicoIE
 from .ninegag import NineGagIE

+from .noco import NocoIE

 from .normalboots import NormalbootsIE
 from .novamov import NovaMovIE
 from .nowness import NownessIE
 from .nowvideo import NowVideoIE
 from .normalboots import NormalbootsIE
 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 .oe1 import OE1IE
 from .ooyala import OoyalaIE
 from .orf import ORFIE
 from .oe1 import OE1IE
 from .ooyala import OoyalaIE
 from .orf import ORFIE


@@ -206,6 +215,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


@@ -217,9 +227,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,


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


@@ -237,7 +254,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


@@ -251,6 +267,7 @@ from .tf1 import TF1IE
 from .theplatform import ThePlatformIE
 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE
 from .theplatform import ThePlatformIE
 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE

+from .tlc import TlcIE, TlcDeIE

 from .toutv import TouTvIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE
 from .toutv import TouTvIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE


@@ -280,6 +297,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,


@@ -288,15 +306,21 @@ 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

+from .vuclip import VuClipIE

 from .washingtonpost import WashingtonPostIE
 from .wat import WatIE
 from .wdr import (
     WDRIE,
 from .washingtonpost import WashingtonPostIE
 from .wat import WatIE
 from .wdr import (
     WDRIE,

+    WDRMobileIE,

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