Merge remote-tracking branch 'sehrgut/Grooveshark'

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 3f6c67fa568a8134ea2fceb3ee0a17e4133ec338..0d78240237efce67ac44c0aac0c1e857d0b949ee 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -1,8 +1,11 @@
+from .abc import ABCIE

 from .academicearth import AcademicEarthCourseIE
 from .addanime import AddAnimeIE
 from .academicearth import AcademicEarthCourseIE
 from .addanime import AddAnimeIE

+from .adultswim import AdultSwimIE

 from .aftonbladet import AftonbladetIE
 from .anitube import AnitubeIE
 from .aol import AolIE
 from .aftonbladet import AftonbladetIE
 from .anitube import AnitubeIE
 from .aol import AolIE

+from .allocine import AllocineIE

 from .aparat import AparatIE
 from .appletrailers import AppleTrailersIE
 from .archiveorg import ArchiveOrgIE
 from .aparat import AparatIE
 from .appletrailers import AppleTrailersIE
 from .archiveorg import ArchiveOrgIE


@@ -51,6 +54,7 @@ from .cnn import (
 from .collegehumor import CollegeHumorIE
 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
 from .condenast import CondeNastIE
 from .collegehumor import CollegeHumorIE
 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
 from .condenast import CondeNastIE

+from .cracked import CrackedIE

 from .criterion import CriterionIE
 from .crunchyroll import CrunchyrollIE
 from .cspan import CSpanIE
 from .criterion import CriterionIE
 from .crunchyroll import CrunchyrollIE
 from .cspan import CSpanIE


@@ -61,8 +65,11 @@ from .dailymotion import (
     DailymotionUserIE,
 )
 from .daum import DaumIE
     DailymotionUserIE,
 )
 from .daum import DaumIE

+from .dfb import DFBIE

 from .dotsub import DotsubIE
 from .dreisat import DreiSatIE
 from .dotsub import DotsubIE
 from .dreisat import DreiSatIE

+from .drtv import DRTVIE
+from .dump import DumpIE

 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE
 from .divxstage import DivxStageIE
 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE
 from .divxstage import DivxStageIE


@@ -71,6 +78,10 @@ from .ebaumsworld import EbaumsWorldIE
 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE
 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE

+from .ellentv import (
+    EllenTVIE,
+    EllenTVClipsIE,
+)

 from .elpais import ElPaisIE
 from .empflix import EmpflixIE
 from .engadget import EngadgetIE
 from .elpais import ElPaisIE
 from .empflix import EmpflixIE
 from .engadget import EngadgetIE


@@ -81,6 +92,7 @@ from .extremetube import ExtremeTubeIE
 from .facebook import FacebookIE
 from .faz import FazIE
 from .fc2 import FC2IE
 from .facebook import FacebookIE
 from .faz import FazIE
 from .fc2 import FC2IE

+from .firedrive import FiredriveIE

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


@@ -103,18 +115,24 @@ from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 from .funnyordie import FunnyOrDieIE
 from .gamekings import GamekingsIE
 from .freespeech import FreespeechIE
 from .funnyordie import FunnyOrDieIE
 from .gamekings import GamekingsIE

+from .gameone import GameOneIE

 from .gamespot import GameSpotIE
 from .gamespot import GameSpotIE

+from .gamestar import GameStarIE

 from .gametrailers import GametrailersIE
 from .gdcvault import GDCVaultIE
 from .generic import GenericIE
 from .gametrailers import GametrailersIE
 from .gdcvault import GDCVaultIE
 from .generic import GenericIE

+from .godtube import GodTubeIE

 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE

+from .gorillavid import GorillaVidIE
+from .goshgay import GoshgayIE

 from .grooveshark import GroovesharkIE
 from .hark import HarkIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE
 from .grooveshark import GroovesharkIE
 from .hark import HarkIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE

+from .howstuffworks import HowStuffWorksIE

 from .huffpost import HuffPostIE
 from .hypem import HypemIE
 from .iconosquare import IconosquareIE
 from .huffpost import HuffPostIE
 from .hypem import HypemIE
 from .iconosquare import IconosquareIE


@@ -132,8 +150,10 @@ from .ivi import (
     IviIE,
     IviCompilationIE
 )
     IviIE,
     IviCompilationIE
 )

+from .izlesene import IzleseneIE

 from .jadorecettepub import JadoreCettePubIE
 from .jeuxvideo import JeuxVideoIE
 from .jadorecettepub import JadoreCettePubIE
 from .jeuxvideo import JeuxVideoIE

+from .jove import JoveIE

 from .jukebox import JukeboxIE
 from .justintv import JustinTVIE
 from .jpopsukitv import JpopsukiIE
 from .jukebox import JukeboxIE
 from .justintv import JustinTVIE
 from .jpopsukitv import JpopsukiIE


@@ -143,10 +163,16 @@ from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE
 from .kontrtube import KontrTubeIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE
 from .kontrtube import KontrTubeIE

+from .krasview import KrasViewIE
+from .ku6 import Ku6IE

 from .la7 import LA7IE
 from .lifenews import LifeNewsIE
 from .liveleak import LiveLeakIE
 from .la7 import LA7IE
 from .lifenews import LifeNewsIE
 from .liveleak import LiveLeakIE

-from .livestream import LivestreamIE, LivestreamOriginalIE
+from .livestream import (
+    LivestreamIE,
+    LivestreamOriginalIE,
+    LivestreamShortenerIE,
+)

 from .lynda import (
     LyndaIE,
     LyndaCourseIE
 from .lynda import (
     LyndaIE,
     LyndaCourseIE


@@ -159,16 +185,22 @@ from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mit import TechTVMITIE, MITIE, OCWMITIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mit import TechTVMITIE, MITIE, OCWMITIE

+from .mitele import MiTeleIE

 from .mixcloud import MixcloudIE
 from .mixcloud import MixcloudIE

+from .mlb import MLBIE

 from .mpora import MporaIE
 from .mofosex import MofosexIE
 from .mpora import MporaIE
 from .mofosex import MofosexIE

+from .mojvideo import MojvideoIE

 from .mooshare import MooshareIE
 from .morningstar import MorningstarIE
 from .mooshare import MooshareIE
 from .morningstar import MorningstarIE

+from .motherless import MotherlessIE

 from .motorsport import MotorsportIE
 from .motorsport import MotorsportIE

+from .movieclips import MovieClipsIE

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

+    MTVServicesEmbeddedIE,

     MTVIggyIE,
 )
 from .musicplayon import MusicPlayOnIE
     MTVIggyIE,
 )
 from .musicplayon import MusicPlayOnIE


@@ -195,16 +227,25 @@ 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 .npo import NPOIE
+from .nrk import (
+    NRKIE,
+    NRKTVIE,
+)

 from .ntv import NTVIE
 from .nytimes import NYTimesIE
 from .nuvid import NuvidIE
 from .ntv import NTVIE
 from .nytimes import NYTimesIE
 from .nuvid import NuvidIE

-from .oe1 import OE1IE

 from .ooyala import OoyalaIE
 from .ooyala import OoyalaIE

-from .orf import ORFIE
+from .orf import (
+    ORFTVthekIE,
+    ORFOE1IE,
+    ORFFM4IE,
+)

 from .parliamentliveuk import ParliamentLiveUKIE
 from .parliamentliveuk import ParliamentLiveUKIE

+from .patreon import PatreonIE

 from .pbs import PBSIE
 from .photobucket import PhotobucketIE
 from .pbs import PBSIE
 from .photobucket import PhotobucketIE

+from .playfm import PlayFMIE

 from .playvid import PlayvidIE
 from .podomatic import PodomaticIE
 from .pornhd import PornHdIE
 from .playvid import PlayvidIE
 from .podomatic import PodomaticIE
 from .pornhd import PornHdIE


@@ -213,16 +254,20 @@ from .pornotube import PornotubeIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .pyvideo import PyvideoIE
 from .radiofrance import RadioFranceIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .pyvideo import PyvideoIE
 from .radiofrance import RadioFranceIE

+from .rai import RaiIE

 from .rbmaradio import RBMARadioIE
 from .redtube import RedTubeIE
 from .rbmaradio import RBMARadioIE
 from .redtube import RedTubeIE

+from .reverbnation import ReverbNationIE

 from .ringtv import RingTVIE
 from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtbf import RTBFIE
 from .ringtv import RingTVIE
 from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtbf import RTBFIE

+from .rtlnl import RtlXlIE

 from .rtlnow import RTLnowIE
 from .rts import RTSIE
 from .rtlnow import RTLnowIE
 from .rts import RTSIE

-from .rtve import RTVEALaCartaIE
+from .rtve import RTVEALaCartaIE, RTVELiveIE
+from .ruhd import RUHDIE

 from .rutube import (
     RutubeIE,
     RutubeChannelIE,
 from .rutube import (
     RutubeIE,
     RutubeChannelIE,


@@ -230,9 +275,13 @@ from .rutube import (
     RutubePersonIE,
 )
 from .rutv import RUTVIE
     RutubePersonIE,
 )
 from .rutv import RUTVIE

+from .sapo import SapoIE

 from .savefrom import SaveFromIE
 from .savefrom import SaveFromIE

+from .sbs import SBSIE

 from .scivee import SciVeeIE
 from .scivee import SciVeeIE

+from .screencast import ScreencastIE

 from .servingsys import ServingSysIE
 from .servingsys import ServingSysIE

+from .shared import SharedIE

 from .sina import SinaIE
 from .slideshare import SlideshareIE
 from .slutload import SlutloadIE
 from .sina import SinaIE
 from .slideshare import SlideshareIE
 from .slutload import SlutloadIE


@@ -242,6 +291,8 @@ from .smotri import (
     SmotriUserIE,
     SmotriBroadcastIE,
 )
     SmotriUserIE,
     SmotriBroadcastIE,
 )

+from .snotr import SnotrIE
+from .sockshare import SockshareIE

 from .sohu import SohuIE
 from .soundcloud import (
     SoundcloudIE,
 from .sohu import SohuIE
 from .soundcloud import (
     SoundcloudIE,


@@ -249,23 +300,33 @@ from .soundcloud import (
     SoundcloudUserIE,
     SoundcloudPlaylistIE
 )
     SoundcloudUserIE,
     SoundcloudPlaylistIE
 )

-from .southparkstudios import (
-    SouthParkStudiosIE,
+from .soundgasm import SoundgasmIE
+from .southpark import (
+    SouthParkIE,

     SouthparkDeIE,
 )
 from .space import SpaceIE
 from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE
     SouthparkDeIE,
 )
 from .space import SpaceIE
 from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE

+from .spiegeltv import SpiegeltvIE

 from .spike import SpikeIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 from .spike import SpikeIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE

+from .swrmediathek import SWRMediathekIE

 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE

+from .tagesschau import TagesschauIE
+from .teachertube import (
+    TeacherTubeIE,
+    TeacherTubeUserIE,
+)
+from .teachingchannel import TeachingChannelIE

 from .teamcoco import TeamcocoIE
 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .teamcoco import TeamcocoIE
 from .techtalks import TechTalksIE
 from .ted import TEDIE

+from .tenplay import TenPlayIE

 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .theplatform import ThePlatformIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .theplatform import ThePlatformIE


@@ -283,6 +344,8 @@ from .tumblr import TumblrIE
 from .tutv import TutvIE
 from .tvigle import TvigleIE
 from .tvp import TvpIE
 from .tutv import TutvIE
 from .tvigle import TvigleIE
 from .tvp import TvpIE

+from .tvplay import TVPlayIE
+from .ubu import UbuIE

 from .udemy import (
     UdemyIE,
     UdemyCourseIE
 from .udemy import (
     UdemyIE,
     UdemyCourseIE


@@ -295,6 +358,7 @@ from .veehd import VeeHDIE
 from .veoh import VeohIE
 from .vesti import VestiIE
 from .vevo import VevoIE
 from .veoh import VeohIE
 from .vesti import VestiIE
 from .vevo import VevoIE

+from .vh1 import VH1IE

 from .viddler import ViddlerIE
 from .videobam import VideoBamIE
 from .videodetective import VideoDetectiveIE
 from .viddler import ViddlerIE
 from .videobam import VideoBamIE
 from .videodetective import VideoDetectiveIE


@@ -303,6 +367,7 @@ from .videofyme import VideofyMeIE
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE
 from .videoweed import VideoWeedIE
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE
 from .videoweed import VideoWeedIE

+from .vidme import VidmeIE

 from .vimeo import (
     VimeoIE,
     VimeoChannelIE,
 from .vimeo import (
     VimeoIE,
     VimeoChannelIE,


@@ -312,14 +377,17 @@ from .vimeo import (
     VimeoReviewIE,
     VimeoWatchLaterIE,
 )
     VimeoReviewIE,
     VimeoWatchLaterIE,
 )

+from .vimple import VimpleIE

 from .vine import (
     VineIE,
     VineUserIE,
 )
 from .viki import VikiIE
 from .vk import VKIE
 from .vine import (
     VineIE,
     VineUserIE,
 )
 from .viki import VikiIE
 from .vk import VKIE

+from .vodlocker import VodlockerIE

 from .vube import VubeIE
 from .vuclip import VuClipIE
 from .vube import VubeIE
 from .vuclip import VuClipIE

+from .vulture import VultureIE

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


@@ -331,7 +399,9 @@ from .weibo import WeiboIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE

+from .wrzuta import WrzutaIE

 from .xbef import XBefIE
 from .xbef import XBefIE

+from .xboxclips import XboxClipsIE

 from .xhamster import XHamsterIE
 from .xnxx import XNXXIE
 from .xvideos import XVideosIE
 from .xhamster import XHamsterIE
 from .xnxx import XNXXIE
 from .xvideos import XVideosIE


@@ -361,6 +431,7 @@ from .youtube import (
     YoutubeUserIE,
     YoutubeWatchLaterIE,
 )
     YoutubeUserIE,
     YoutubeWatchLaterIE,
 )

+

 from .zdf import ZDFIE
 
 
 from .zdf import ZDFIE