Merge remote-tracking branch 'yasoob/master'

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 20dec216c4a75d8f85a8716abd7de83643a7c60b..b4a1c20e9489042f6876b1c98fb0d1589dfcfce4 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -1,20 +1,30 @@
-
+from .archiveorg import ArchiveOrgIE

 from .ard import ARDIE
 from .arte import ArteTvIE
 from .auengine import AUEngineIE
 from .bandcamp import BandcampIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .breakcom import BreakIE
 from .ard import ARDIE
 from .arte import ArteTvIE
 from .auengine import AUEngineIE
 from .bandcamp import BandcampIE
 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 .dailymotion import DailymotionIE
 from .depositfiles import DepositFilesIE
 from .cspan import CSpanIE
 from .dailymotion import DailymotionIE
 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 .funnyordie import FunnyOrDieIE

+from .gamespot import GameSpotIE

 from .gametrailers import GametrailersIE
 from .generic import GenericIE
 from .googleplus import GooglePlusIE
 from .gametrailers import GametrailersIE
 from .generic import GenericIE
 from .googleplus import GooglePlusIE


@@ -22,12 +32,15 @@ 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 .ina import InaIE
 from .infoq import InfoQIE

+from .instagram import InstagramIE

 from .jukebox import JukeboxIE
 from .justintv import JustinTVIE
 from .keek import KeekIE
 from .liveleak import LiveLeakIE
 from .jukebox import JukeboxIE
 from .justintv import JustinTVIE
 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


@@ -38,6 +51,8 @@ from .photobucket import PhotobucketIE
 from .pornotube import PornotubeIE
 from .rbmaradio import RBMARadioIE
 from .redtube import RedTubeIE
 from .pornotube import PornotubeIE
 from .rbmaradio import RBMARadioIE
 from .redtube import RedTubeIE

+from .ringtv import RingTVIE
+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


@@ -45,13 +60,21 @@ from .statigram import StatigramIE
 from .steam import SteamIE
 from .teamcoco import TeamcocoIE
 from .ted import TEDIE
 from .steam import SteamIE
 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 .tudou import TudouIE
 from .tumblr import TumblrIE

+from .tutv import TutvIE

 from .ustream import UstreamIE
 from .vbox7 import Vbox7IE
 from .ustream import UstreamIE
 from .vbox7 import Vbox7IE

+from .veoh import VeohIE

 from .vevo import VevoIE
 from .vimeo import VimeoIE
 from .vine import VineIE
 from .vevo import VevoIE
 from .vimeo import VimeoIE
 from .vine import VineIE

+from .c56 import C56IE
+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


@@ -61,9 +84,18 @@ from .yahoo import YahooIE, 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

-from .youtube import YoutubeIE, YoutubePlaylistIE, YoutubeSearchIE, YoutubeUserIE, YoutubeChannelIE
+from .youtube import (
+    YoutubeIE,
+    YoutubePlaylistIE,
+    YoutubeSearchIE,
+    YoutubeUserIE,
+    YoutubeChannelIE,
+    YoutubeShowIE,
+    YoutubeSubscriptionsIE,
+)

 from .zdf import ZDFIE
 
 from .zdf import ZDFIE
 

+

 _ALL_CLASSES = [
     klass
     for name, klass in globals().items()
 _ALL_CLASSES = [
     klass
     for name, klass in globals().items()