Merge tag 'upstream/2014.06.07'

[youtubedl] / youtube_dl / extractor / __init__.py

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index d66f7b02641437bd97ccd6c9aa9b3ef7211d3c9b..15a42ce44246f708a6b06027c366a4b41eab5c7b 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -1,6 +1,8 @@
 from .academicearth import AcademicEarthCourseIE
 from .addanime import AddAnimeIE
 from .academicearth import AcademicEarthCourseIE
 from .addanime import AddAnimeIE

+from .aftonbladet import AftonbladetIE

 from .anitube import AnitubeIE
 from .anitube import AnitubeIE

+from .aol import AolIE

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


@@ -9,27 +11,43 @@ from .arte import (
     ArteTvIE,
     ArteTVPlus7IE,
     ArteTVCreativeIE,
     ArteTvIE,
     ArteTVPlus7IE,
     ArteTVCreativeIE,

+    ArteTVConcertIE,

     ArteTVFutureIE,
     ArteTVDDCIE,
     ArteTVFutureIE,
     ArteTVDDCIE,

+    ArteTVEmbedIE,

 )
 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 .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

+from .br import BRIE

 from .breakcom import BreakIE
 from .brightcove import BrightcoveIE
 from .breakcom import BreakIE
 from .brightcove import BrightcoveIE

+from .byutv import BYUtvIE

 from .c56 import C56IE
 from .c56 import C56IE

+from .canal13cl import Canal13clIE

 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .cbs import CBSIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .cbs import CBSIE

+from .cbsnews import CBSNewsIE
+from .ceskatelevize import CeskaTelevizeIE

 from .channel9 import Channel9IE
 from .channel9 import Channel9IE

+from .chilloutzone import ChilloutzoneIE

 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 .clipsyndicate import ClipsyndicateIE

+from .clubic import ClubicIE

 from .cmt import CMTIE
 from .cmt import CMTIE

-from .cnn import CNNIE
+from .cnet import CNETIE
+from .cnn import (
+    CNNIE,
+    CNNBlogsIE,
+)

 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


@@ -43,25 +61,36 @@ from .dailymotion import (
     DailymotionUserIE,
 )
 from .daum import DaumIE
     DailymotionUserIE,
 )
 from .daum import DaumIE

-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 .divxstage import DivxStageIE
+from .dropbox import DropboxIE

 from .ebaumsworld import EbaumsWorldIE
 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE
 from .ebaumsworld import EbaumsWorldIE
 from .ehow import EHowIE
 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 .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 .fc2 import FC2IE
+from .firstpost import FirstpostIE
+from .firsttv import FirstTVIE
+from .fivemin import FiveMinIE

 from .fktv import (
     FKTVIE,
     FKTVPosteckeIE,
 )
 from .flickr import FlickrIE
 from .fktv import (
     FKTVIE,
     FKTVPosteckeIE,
 )
 from .flickr import FlickrIE

+from .fourtube import FourTubeIE
+from .franceculture import FranceCultureIE

 from .franceinter import FranceInterIE
 from .francetv import (
     PluzzIE,
 from .franceinter import FranceInterIE
 from .francetv import (
     PluzzIE,


@@ -71,17 +100,23 @@ 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 .gametrailers import GametrailersIE
 from .funnyordie import FunnyOrDieIE
 from .gamekings import GamekingsIE
 from .gamespot import GameSpotIE
 from .gametrailers import GametrailersIE

+from .gdcvault import GDCVaultIE

 from .generic import GenericIE
 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .hark import HarkIE
 from .generic import GenericIE
 from .googleplus import GooglePlusIE
 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 .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE

+from .huffpost import HuffPostIE

 from .hypem import HypemIE
 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,


@@ -89,12 +124,14 @@ from .imdb import (
 )
 from .ina import InaIE
 from .infoq import InfoQIE
 )
 from .ina import InaIE
 from .infoq import InfoQIE

-from .instagram import InstagramIE
+from .instagram import InstagramIE, InstagramUserIE

 from .internetvideoarchive import InternetVideoArchiveIE
 from .internetvideoarchive import InternetVideoArchiveIE

+from .iprima import IPrimaIE

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

+from .jadorecettepub import JadoreCettePubIE

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


@@ -104,43 +141,79 @@ 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 .kontrtube import KontrTubeIE
+from .ku6 import Ku6IE
+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 .mailru import MailRuIE
+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

-from .mit import TechTVMITIE, MITIE
+from .mit import TechTVMITIE, MITIE, OCWMITIE

 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 .mtv import MTVIE
+from .mooshare import MooshareIE
+from .morningstar import MorningstarIE
+from .motorsport import MotorsportIE
+from .moviezine import MoviezineIE
+from .movshare import MovShareIE
+from .mtv import (
+    MTVIE,
+    MTVIggyIE,
+)
+from .musicplayon import MusicPlayOnIE

 from .muzu import MuzuTVIE
 from .myspace import MySpaceIE
 from .myspass import MySpassIE
 from .myvideo import MyVideoIE
 from .naver import NaverIE
 from .nba import NBAIE
 from .muzu import MuzuTVIE
 from .myspace import MySpaceIE
 from .myspass import MySpassIE
 from .myvideo import MyVideoIE
 from .naver import NaverIE
 from .nba import NBAIE

-from .nbc import NBCNewsIE
+from .nbc import (
+    NBCIE,
+    NBCNewsIE,
+)
+from .ndr import NDRIE

 from .ndtv import NDTVIE
 from .newgrounds import NewgroundsIE
 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 .nhl import NHLIE, NHLVideocenterIE
 from .niconico import NiconicoIE
 from .ninegag import NineGagIE

-from .novamov import NovamovIE
+from .noco import NocoIE
+from .normalboots import NormalbootsIE
+from .novamov import NovaMovIE
+from .nowness import NownessIE

 from .nowvideo import NowVideoIE
 from .nowvideo import NowVideoIE

+from .nrk import (
+    NRKIE,
+    NRKTVIE,
+)
+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 .ooyala import OoyalaIE
 from .orf import ORFIE

+from .parliamentliveuk import ParliamentLiveUKIE

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

+from .playvid import PlayvidIE

 from .podomatic import PodomaticIE
 from .pornhd import PornHdIE
 from .pornhub import PornHubIE
 from .pornotube import PornotubeIE
 from .podomatic import PodomaticIE
 from .pornhd import PornHdIE
 from .pornhub import PornHubIE
 from .pornotube import PornotubeIE

+from .prosiebensat1 import ProSiebenSat1IE

 from .pyvideo import PyvideoIE
 from .radiofrance import RadioFranceIE
 from .rbmaradio import RBMARadioIE
 from .pyvideo import PyvideoIE
 from .radiofrance import RadioFranceIE
 from .rbmaradio import RBMARadioIE


@@ -149,11 +222,23 @@ 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 .rtlnow import RTLnowIE

-from .rutube import RutubeIE
+from .rts import RTSIE
+from .rtve import RTVEALaCartaIE
+from .rutube import (
+    RutubeIE,
+    RutubeChannelIE,
+    RutubeMovieIE,
+    RutubePersonIE,
+)
+from .rutv import RUTVIE
+from .savefrom import SaveFromIE
+from .scivee import SciVeeIE
+from .servingsys import ServingSysIE

 from .sina import SinaIE
 from .sina import SinaIE

-from .slashdot import SlashdotIE

 from .slideshare import SlideshareIE
 from .slideshare import SlideshareIE

+from .slutload import SlutloadIE

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


@@ -161,7 +246,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,


@@ -169,36 +259,62 @@ 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 .spiegeltv import SpiegeltvIE
+from .spike import SpikeIE

 from .stanfordoc import StanfordOpenClassroomIE
 from .stanfordoc import StanfordOpenClassroomIE

-from .statigram import StatigramIE

 from .steam import SteamIE
 from .streamcloud import StreamcloudIE
 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 .sztvhu import SztvHuIE

+from .tagesschau import TagesschauIE
+from .teachertube import (
+    TeacherTubeIE,
+    TeacherTubeClassroomIE,
+)
+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 .testurl import TestURLIE

 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 .tlc import TlcIE, TlcDeIE

 from .toutv import TouTvIE
 from .toutv import TouTvIE

+from .toypics import ToypicsUserIE, ToypicsIE

 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE
 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE

+from .trutube import TruTubeIE

 from .tube8 import Tube8IE
 from .tudou import TudouIE
 from .tumblr import TumblrIE
 from .tutv import TutvIE
 from .tube8 import Tube8IE
 from .tudou import TudouIE
 from .tumblr import TumblrIE
 from .tutv import TutvIE

+from .tvigle import TvigleIE

 from .tvp import TvpIE
 from .tvp import TvpIE

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

 from .unistra import UnistraIE
 from .unistra import UnistraIE

+from .urort import UrortIE

 from .ustream import UstreamIE, UstreamChannelIE
 from .vbox7 import Vbox7IE
 from .veehd import VeeHDIE
 from .veoh import VeohIE
 from .ustream import UstreamIE, UstreamChannelIE
 from .vbox7 import Vbox7IE
 from .veehd import VeeHDIE
 from .veoh import VeohIE

+from .vesti import VestiIE

 from .vevo import VevoIE
 from .vevo import VevoIE

-from .vice import ViceIE
+from .vh1 import VH1IE

 from .viddler import ViddlerIE
 from .viddler import ViddlerIE

+from .videobam import VideoBamIE

 from .videodetective import VideoDetectiveIE
 from .videodetective import VideoDetectiveIE

+from .videolecturesnet import VideoLecturesNetIE

 from .videofyme import VideofyMeIE
 from .videopremium import VideoPremiumIE
 from .videofyme import VideofyMeIE
 from .videopremium import VideoPremiumIE

+from .videott import VideoTtIE
+from .videoweed import VideoWeedIE

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


@@ -206,20 +322,32 @@ 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 .viki import VikiIE
 from .vk import VKIE

+from .vube import VubeIE
+from .vuclip import VuClipIE
+from .washingtonpost import WashingtonPostIE

 from .wat import WatIE
 from .wat import WatIE

-from .websurg import WeBSurgIE
+from .wdr import (
+    WDRIE,
+    WDRMobileIE,
+    WDRMausIE,
+)

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

+from .xbef import XBefIE

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

-from .xtube import XTubeIE
+from .xtube import XTubeUserIE, XTubeIE

 from .yahoo import (
     YahooIE,
     YahooNewsIE,
 from .yahoo import (
     YahooIE,
     YahooNewsIE,


@@ -230,19 +358,20 @@ from .youku import YoukuIE
 from .youporn import YouPornIE
 from .youtube import (
     YoutubeIE,
 from .youporn import YouPornIE
 from .youtube import (
     YoutubeIE,

+    YoutubeChannelIE,
+    YoutubeFavouritesIE,
+    YoutubeHistoryIE,

     YoutubePlaylistIE,
     YoutubePlaylistIE,

-    YoutubeSearchIE,
+    YoutubeRecommendedIE,

     YoutubeSearchDateIE,
     YoutubeSearchDateIE,

-    YoutubeUserIE,
-    YoutubeChannelIE,
+    YoutubeSearchIE,
+    YoutubeSearchURLIE,

     YoutubeShowIE,
     YoutubeSubscriptionsIE,
     YoutubeShowIE,
     YoutubeSubscriptionsIE,

-    YoutubeRecommendedIE,
+    YoutubeTopListIE,

     YoutubeTruncatedURLIE,
     YoutubeTruncatedURLIE,

+    YoutubeUserIE,

     YoutubeWatchLaterIE,
     YoutubeWatchLaterIE,

-    YoutubeFavouritesIE,
-    YoutubeHistoryIE,
-    YoutubeTopListIE,

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