Merge pull request #2342 from MikeCol/tube8

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 80fc1f6aeff5d569fbaa9f9bd2b815bb9842952e..c0a57c73d860d2320ed60126ef69d8a5e1660fec 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -25,6 +25,7 @@ from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .cbs import CBSIE
 from .channel9 import Channel9IE
 from .canalc2 import Canalc2IE
 from .cbs import CBSIE
 from .channel9 import Channel9IE

+from .chilloutzone import ChilloutzoneIE

 from .cinemassacre import CinemassacreIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .cinemassacre import CinemassacreIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE


@@ -48,17 +49,20 @@ from .depositfiles import DepositFilesIE
 from .dotsub import DotsubIE
 from .dreisat import DreiSatIE
 from .defense import DefenseGouvFrIE
 from .dotsub import DotsubIE
 from .dreisat import DreiSatIE
 from .defense import DefenseGouvFrIE

+from .discovery import DiscoveryIE

 from .dropbox import DropboxIE
 from .ebaumsworld import EbaumsWorldIE
 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE
 from .dropbox import DropboxIE
 from .ebaumsworld import EbaumsWorldIE
 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE

+from .elpais import ElPaisIE

 from .escapist import EscapistIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE
 from .extremetube import ExtremeTubeIE
 from .facebook import FacebookIE
 from .faz import FazIE
 from .escapist import EscapistIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE
 from .extremetube import ExtremeTubeIE
 from .facebook import FacebookIE
 from .faz import FazIE

+from .firstpost import FirstpostIE

 from .fktv import (
     FKTVIE,
     FKTVPosteckeIE,
 from .fktv import (
     FKTVIE,
     FKTVPosteckeIE,


@@ -73,6 +77,7 @@ from .francetv import (
     CultureboxIE,
 )
 from .freesound import FreesoundIE
     CultureboxIE,
 )
 from .freesound import FreesoundIE

+from .freespeech import FreespeechIE

 from .funnyordie import FunnyOrDieIE
 from .gamekings import GamekingsIE
 from .gamespot import GameSpotIE
 from .funnyordie import FunnyOrDieIE
 from .gamekings import GamekingsIE
 from .gamespot import GameSpotIE


@@ -83,6 +88,7 @@ from .googlesearch import GoogleSearchIE
 from .hark import HarkIE
 from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE
 from .hark import HarkIE
 from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE

+from .huffpost import HuffPostIE

 from .hypem import HypemIE
 from .ign import IGNIE, OneUPIE
 from .imdb import (
 from .hypem import HypemIE
 from .ign import IGNIE, OneUPIE
 from .imdb import (


@@ -93,6 +99,7 @@ from .ina import InaIE
 from .infoq import InfoQIE
 from .instagram import InstagramIE
 from .internetvideoarchive import InternetVideoArchiveIE
 from .infoq import InfoQIE
 from .instagram import InstagramIE
 from .internetvideoarchive import InternetVideoArchiveIE

+from .iprima import IPrimaIE

 from .ivi import (
     IviIE,
     IviCompilationIE
 from .ivi import (
     IviIE,
     IviCompilationIE


@@ -106,13 +113,17 @@ from .keezmovies import KeezMoviesIE
 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE
 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE

+from .la7 import LA7IE
+from .lifenews import LifeNewsIE

 from .liveleak import LiveLeakIE
 from .livestream import LivestreamIE, LivestreamOriginalIE
 from .lynda import (
     LyndaIE,
     LyndaCourseIE
 )
 from .liveleak import LiveLeakIE
 from .livestream import LivestreamIE, LivestreamOriginalIE
 from .lynda import (
     LyndaIE,
     LyndaCourseIE
 )

+from .m6 import M6IE

 from .macgamestore import MacGameStoreIE
 from .macgamestore import MacGameStoreIE

+from .malemotion import MalemotionIE

 from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE


@@ -120,6 +131,7 @@ from .mit import TechTVMITIE, MITIE
 from .mixcloud import MixcloudIE
 from .mpora import MporaIE
 from .mofosex import MofosexIE
 from .mixcloud import MixcloudIE
 from .mpora import MporaIE
 from .mofosex import MofosexIE

+from .mooshare import MooshareIE

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


@@ -131,11 +143,14 @@ from .myvideo import MyVideoIE
 from .naver import NaverIE
 from .nba import NBAIE
 from .nbc import NBCNewsIE
 from .naver import NaverIE
 from .nba import NBAIE
 from .nbc import NBCNewsIE

+from .ndr import NDRIE

 from .ndtv import NDTVIE
 from .newgrounds import NewgroundsIE
 from .ndtv import NDTVIE
 from .newgrounds import NewgroundsIE

+from .nfb import NFBIE

 from .nhl import NHLIE, NHLVideocenterIE
 from .niconico import NiconicoIE
 from .ninegag import NineGagIE
 from .nhl import NHLIE, NHLVideocenterIE
 from .niconico import NiconicoIE
 from .ninegag import NineGagIE

+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


@@ -156,7 +171,12 @@ from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtlnow import RTLnowIE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtlnow import RTLnowIE

-from .rutube import RutubeIE
+from .rutube import (
+    RutubeIE,
+    RutubeChannelIE,
+    RutubeMovieIE,
+    RutubePersonIE,
+)

 from .servingsys import ServingSysIE
 from .sina import SinaIE
 from .slashdot import SlashdotIE
 from .servingsys import ServingSysIE
 from .sina import SinaIE
 from .slashdot import SlashdotIE


@@ -188,6 +208,7 @@ from .ted import TEDIE
 from .tf1 import TF1IE
 from .theplatform import ThePlatformIE
 from .thisav import ThisAVIE
 from .tf1 import TF1IE
 from .theplatform import ThePlatformIE
 from .thisav import ThisAVIE

+from .tinypic import TinyPicIE

 from .toutv import TouTvIE
 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE
 from .toutv import TouTvIE
 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE


@@ -218,8 +239,8 @@ from .vimeo import (
 from .vine import VineIE
 from .viki import VikiIE
 from .vk import VKIE
 from .vine import VineIE
 from .viki import VikiIE
 from .vk import VKIE

+from .vube import VubeIE

 from .wat import WatIE
 from .wat import WatIE

-from .websurg import WeBSurgIE

 from .weibo import WeiboIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .weibo import WeiboIE
 from .wimp import WimpIE
 from .wistia import WistiaIE