Merge tag 'upstream/2013.08.08'

[youtubedl] / youtube_dl / extractor / __init__.py

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 934419c4343a9d078ceffa7c91be9a21b4600888..84c02c2ed99967832264e642fa084367cd4eff05 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -6,17 +6,23 @@ from .bandcamp import BandcampIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .breakcom import BreakIE
 from .brightcove import BrightcoveIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .breakcom import BreakIE
 from .brightcove import BrightcoveIE

+from .canalplus import CanalplusIE

 from .collegehumor import CollegeHumorIE
 from .comedycentral import ComedyCentralIE
 from .collegehumor import CollegeHumorIE
 from .comedycentral import ComedyCentralIE

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

 from .cspan import CSpanIE
 from .cspan import CSpanIE

-from .dailymotion import DailymotionIE
+from .dailymotion import DailymotionIE, DailymotionPlaylistIE

 from .depositfiles import DepositFilesIE
 from .dotsub import DotsubIE
 from .dreisat import DreiSatIE
 from .depositfiles import DepositFilesIE
 from .dotsub import DotsubIE
 from .dreisat import DreiSatIE

+from .ehow import EHowIE

 from .eighttracks import EightTracksIE
 from .escapist import EscapistIE
 from .eighttracks import EightTracksIE
 from .escapist import EscapistIE

+from .exfm import ExfmIE

 from .facebook import FacebookIE
 from .flickr import FlickrIE
 from .facebook import FacebookIE
 from .flickr import FlickrIE

+from .freesound import FreesoundIE

 from .funnyordie import FunnyOrDieIE
 from .gamespot import GameSpotIE
 from .gametrailers import GametrailersIE
 from .funnyordie import FunnyOrDieIE
 from .gamespot import GameSpotIE
 from .gametrailers import GametrailersIE


@@ -26,24 +32,31 @@ from .googlesearch import GoogleSearchIE
 from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE
 from .hypem import HypemIE
 from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE
 from .hypem import HypemIE

+from .ign import IGNIE, OneUPIE

 from .ina import InaIE
 from .infoq import InfoQIE
 from .instagram import InstagramIE
 from .jukebox import JukeboxIE
 from .justintv import JustinTVIE
 from .ina import InaIE
 from .infoq import InfoQIE
 from .instagram import InstagramIE
 from .jukebox import JukeboxIE
 from .justintv import JustinTVIE

+from .kankan import KankanIE

 from .keek import KeekIE
 from .liveleak import LiveLeakIE
 from .keek import KeekIE
 from .liveleak import LiveLeakIE

+from .livestream import LivestreamIE

 from .metacafe import MetacafeIE
 from .mixcloud import MixcloudIE
 from .mtv import MTVIE
 from .metacafe import MetacafeIE
 from .mixcloud import MixcloudIE
 from .mtv import MTVIE

+from .muzu import MuzuTVIE

 from .myspass import MySpassIE
 from .myvideo import MyVideoIE
 from .nba import NBAIE
 from .myspass import MySpassIE
 from .myvideo import MyVideoIE
 from .nba import NBAIE

+from .ooyala import OoyalaIE

 from .photobucket import PhotobucketIE
 from .pornotube import PornotubeIE
 from .rbmaradio import RBMARadioIE
 from .redtube import RedTubeIE
 from .ringtv import RingTVIE
 from .photobucket import PhotobucketIE
 from .pornotube import PornotubeIE
 from .rbmaradio import RBMARadioIE
 from .redtube import RedTubeIE
 from .ringtv import RingTVIE

+from .roxwel import RoxwelIE
+from .sina import SinaIE

 from .soundcloud import SoundcloudIE, SoundcloudSetIE
 from .spiegel import SpiegelIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .soundcloud import SoundcloudIE, SoundcloudSetIE
 from .spiegel import SpiegelIE
 from .stanfordoc import StanfordOpenClassroomIE


@@ -52,6 +65,7 @@ from .steam import SteamIE
 from .teamcoco import TeamcocoIE
 from .ted import TEDIE
 from .tf1 import TF1IE
 from .teamcoco import TeamcocoIE
 from .ted import TEDIE
 from .tf1 import TF1IE

+from .thisav import ThisAVIE

 from .traileraddict import TrailerAddictIE
 from .tudou import TudouIE
 from .tumblr import TumblrIE
 from .traileraddict import TrailerAddictIE
 from .tudou import TudouIE
 from .tumblr import TumblrIE


@@ -60,9 +74,12 @@ from .ustream import UstreamIE
 from .vbox7 import Vbox7IE
 from .veoh import VeohIE
 from .vevo import VevoIE
 from .vbox7 import Vbox7IE
 from .veoh import VeohIE
 from .vevo import VevoIE

-from .vimeo import VimeoIE
+from .videofyme import VideofyMeIE
+from .vimeo import VimeoIE, VimeoChannelIE

 from .vine import VineIE
 from .vine import VineIE

+from .c56 import C56IE

 from .wat import WatIE
 from .wat import WatIE

+from .weibo import WeiboIE

 from .wimp import WimpIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .xhamster import XHamsterIE
 from .wimp import WimpIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .xhamster import XHamsterIE


@@ -80,6 +97,9 @@ from .youtube import (
     YoutubeChannelIE,
     YoutubeShowIE,
     YoutubeSubscriptionsIE,
     YoutubeChannelIE,
     YoutubeShowIE,
     YoutubeSubscriptionsIE,

+    YoutubeRecommendedIE,
+    YoutubeWatchLaterIE,
+    YoutubeFavouritesIE,

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