Merge branch 'cliphunter' of https://github.com/pornophage/youtube-dl

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 1fbd10bc5c410efb82ca9568872042fe951a68fd..b8d635c30e72f2e39bb85f6af76c3dbdfc466c24 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -1,6 +1,8 @@
-from .appletrailers import AppleTrailersIE
+from .academicearth import AcademicEarthCourseIE

 from .addanime import AddAnimeIE
 from .anitube import AnitubeIE
 from .addanime import AddAnimeIE
 from .anitube import AnitubeIE

+from .aparat import AparatIE
+from .appletrailers import AppleTrailersIE

 from .archiveorg import ArchiveOrgIE
 from .ard import ARDIE
 from .arte import (
 from .archiveorg import ArchiveOrgIE
 from .ard import ARDIE
 from .arte import (


@@ -8,10 +10,12 @@ from .arte import (
     ArteTVPlus7IE,
     ArteTVCreativeIE,
     ArteTVFutureIE,
     ArteTVPlus7IE,
     ArteTVCreativeIE,
     ArteTVFutureIE,

+    ArteTVDDCIE,

 )
 from .auengine import AUEngineIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 )
 from .auengine import AUEngineIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE

+from .blinkx import BlinkxIE

 from .bliptv import BlipTVIE, BlipTVUserIE
 from .bloomberg import BloombergIE
 from .breakcom import BreakIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .bloomberg import BloombergIE
 from .breakcom import BreakIE


@@ -19,13 +23,19 @@ from .brightcove import BrightcoveIE
 from .c56 import C56IE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .c56 import C56IE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE

+from .cbs import CBSIE
+from .channel9 import Channel9IE

 from .cinemassacre import CinemassacreIE
 from .clipfish import ClipfishIE
 from .cinemassacre import CinemassacreIE
 from .clipfish import ClipfishIE

+from .cliphunter import CliphunterIE
+from .clipsyndicate import ClipsyndicateIE
+from .cmt import CMTIE

 from .cnn import CNNIE
 from .collegehumor import CollegeHumorIE
 from .cnn import CNNIE
 from .collegehumor import CollegeHumorIE

-from .comedycentral import ComedyCentralIE
+from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE

 from .condenast import CondeNastIE
 from .criterion import CriterionIE
 from .condenast import CondeNastIE
 from .criterion import CriterionIE

+from .crunchyroll import CrunchyrollIE

 from .cspan import CSpanIE
 from .d8 import D8IE
 from .dailymotion import (
 from .cspan import CSpanIE
 from .d8 import D8IE
 from .dailymotion import (


@@ -38,11 +48,13 @@ 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 .dropbox import DropboxIE

 from .ebaumsworld import EbaumsWorldIE
 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE
 from .escapist import EscapistIE
 from .ebaumsworld import EbaumsWorldIE
 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE
 from .escapist import EscapistIE

+from .everyonesmixtape import EveryonesMixtapeIE

 from .exfm import ExfmIE
 from .extremetube import ExtremeTubeIE
 from .facebook import FacebookIE
 from .exfm import ExfmIE
 from .extremetube import ExtremeTubeIE
 from .facebook import FacebookIE


@@ -52,13 +64,16 @@ from .fktv import (
     FKTVPosteckeIE,
 )
 from .flickr import FlickrIE
     FKTVPosteckeIE,
 )
 from .flickr import FlickrIE

+from .franceinter import FranceInterIE

 from .francetv import (
     PluzzIE,
     FranceTvInfoIE,
 from .francetv import (
     PluzzIE,
     FranceTvInfoIE,

-    France2IE,
-    GenerationQuoiIE
+    FranceTVIE,
+    GenerationQuoiIE,
+    CultureboxIE,

 )
 from .freesound import FreesoundIE
 )
 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


@@ -69,27 +84,50 @@ 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 .hypem import HypemIE
 from .ign import IGNIE, OneUPIE

+from .imdb import (
+    ImdbIE,
+    ImdbListIE
+)

 from .ina import InaIE
 from .infoq import InfoQIE
 from .instagram import InstagramIE
 from .internetvideoarchive import InternetVideoArchiveIE
 from .ina import InaIE
 from .infoq import InfoQIE
 from .instagram import InstagramIE
 from .internetvideoarchive import InternetVideoArchiveIE

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

 from .jeuxvideo import JeuxVideoIE
 from .jukebox import JukeboxIE
 from .justintv import JustinTVIE
 from .jeuxvideo import JeuxVideoIE
 from .jukebox import JukeboxIE
 from .justintv import JustinTVIE

+from .jpopsukitv import JpopsukiIE

 from .kankan import KankanIE
 from .keezmovies import KeezMoviesIE
 from .kankan import KankanIE
 from .keezmovies import KeezMoviesIE

+from .khanacademy import KhanAcademyIE

 from .kickstarter import KickStarterIE
 from .keek import KeekIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE

+from .la7 import LA7IE

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

+from .lynda import (
+    LyndaIE,
+    LyndaCourseIE
+)
+from .macgamestore import MacGameStoreIE
+from .malemotion import MalemotionIE
+from .mdr import MDRIE

 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mit import TechTVMITIE, MITIE
 from .mixcloud import MixcloudIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mit import TechTVMITIE, MITIE
 from .mixcloud import MixcloudIE

+from .mpora import MporaIE

 from .mofosex import MofosexIE
 from .mofosex import MofosexIE

-from .mtv import MTVIE
+from .mtv import (
+    MTVIE,
+    MTVIggyIE,
+)

 from .muzu import MuzuTVIE
 from .myspace import MySpaceIE
 from .myspass import MySpassIE
 from .muzu import MuzuTVIE
 from .myspace import MySpaceIE
 from .myspass import MySpassIE


@@ -97,16 +135,24 @@ 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 .ndtv import NDTVIE

 from .newgrounds import NewgroundsIE
 from .nhl import NHLIE, NHLVideocenterIE
 from .niconico import NiconicoIE
 from .newgrounds import NewgroundsIE
 from .nhl import NHLIE, NHLVideocenterIE
 from .niconico import NiconicoIE

+from .ninegag import NineGagIE
+from .novamov import NovamovIE
+from .nowness import NownessIE

 from .nowvideo import NowVideoIE
 from .ooyala import OoyalaIE
 from .orf import ORFIE
 from .pbs import PBSIE
 from .photobucket import PhotobucketIE
 from .nowvideo import NowVideoIE
 from .ooyala import OoyalaIE
 from .orf import ORFIE
 from .pbs import PBSIE
 from .photobucket import PhotobucketIE

+from .podomatic import PodomaticIE
+from .pornhd import PornHdIE

 from .pornhub import PornHubIE
 from .pornotube import PornotubeIE
 from .pornhub import PornHubIE
 from .pornotube import PornotubeIE

+from .pyvideo import PyvideoIE
+from .radiofrance import RadioFranceIE

 from .rbmaradio import RBMARadioIE
 from .redtube import RedTubeIE
 from .ringtv import RingTVIE
 from .rbmaradio import RBMARadioIE
 from .redtube import RedTubeIE
 from .ringtv import RingTVIE


@@ -115,9 +161,16 @@ from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtlnow import RTLnowIE
 from .rutube import RutubeIE
 from .roxwel import RoxwelIE
 from .rtlnow import RTLnowIE
 from .rutube import RutubeIE

+from .servingsys import ServingSysIE

 from .sina import SinaIE
 from .slashdot import SlashdotIE
 from .slideshare import SlideshareIE
 from .sina import SinaIE
 from .slashdot import SlashdotIE
 from .slideshare import SlideshareIE

+from .smotri import (
+    SmotriIE,
+    SmotriCommunityIE,
+    SmotriUserIE,
+    SmotriBroadcastIE,
+)

 from .sohu import SohuIE
 from .soundcloud import SoundcloudIE, SoundcloudSetIE, SoundcloudUserIE
 from .southparkstudios import (
 from .sohu import SohuIE
 from .soundcloud import SoundcloudIE, SoundcloudSetIE, SoundcloudUserIE
 from .southparkstudios import (


@@ -127,6 +180,7 @@ from .southparkstudios import (
 from .space import SpaceIE
 from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE
 from .space import SpaceIE
 from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE

+from .spike import SpikeIE

 from .stanfordoc import StanfordOpenClassroomIE
 from .statigram import StatigramIE
 from .steam import SteamIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .statigram import StatigramIE
 from .steam import SteamIE


@@ -136,6 +190,7 @@ from .teamcoco import TeamcocoIE
 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .tf1 import TF1IE
 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .tf1 import TF1IE

+from .theplatform import ThePlatformIE

 from .thisav import ThisAVIE
 from .toutv import TouTvIE
 from .traileraddict import TrailerAddictIE
 from .thisav import ThisAVIE
 from .toutv import TouTvIE
 from .traileraddict import TrailerAddictIE


@@ -156,20 +211,31 @@ from .viddler import ViddlerIE
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
 from .videopremium import VideoPremiumIE
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
 from .videopremium import VideoPremiumIE

-from .vimeo import VimeoIE, VimeoChannelIE
+from .vimeo import (
+    VimeoIE,
+    VimeoChannelIE,
+    VimeoUserIE,
+    VimeoAlbumIE,
+    VimeoGroupsIE,
+    VimeoReviewIE,
+)

 from .vine import VineIE
 from .viki import VikiIE
 from .vk import VKIE
 from .wat import WatIE
 from .vine import VineIE
 from .viki import VikiIE
 from .vk import VKIE
 from .wat import WatIE

-from .websurg import WeBSurgIE

 from .weibo import WeiboIE
 from .wimp import WimpIE
 from .weibo import WeiboIE
 from .wimp import WimpIE

+from .wistia import WistiaIE

 from .worldstarhiphop import WorldStarHipHopIE
 from .xhamster import XHamsterIE
 from .xnxx import XNXXIE
 from .xvideos import XVideosIE
 from .xtube import XTubeIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .xhamster import XHamsterIE
 from .xnxx import XNXXIE
 from .xvideos import XVideosIE
 from .xtube import XTubeIE

-from .yahoo import YahooIE, YahooSearchIE
+from .yahoo import (
+    YahooIE,
+    YahooNewsIE,
+    YahooSearchIE,
+)

 from .youjizz import YouJizzIE
 from .youku import YoukuIE
 from .youporn import YouPornIE
 from .youjizz import YouJizzIE
 from .youku import YoukuIE
 from .youporn import YouPornIE


@@ -187,6 +253,7 @@ from .youtube import (
     YoutubeWatchLaterIE,
     YoutubeFavouritesIE,
     YoutubeHistoryIE,
     YoutubeWatchLaterIE,
     YoutubeFavouritesIE,
     YoutubeHistoryIE,

+    YoutubeTopListIE,

 )
 from .zdf import ZDFIE
 
 )
 from .zdf import ZDFIE