Merge remote-tracking branch 'malept/tds-extended-interviews'

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 06eac56e5fd8e8382f0fb42de8a6080b5bc8cb1b..685fc749d12c4237c03717c5e0af01f9d12ae341 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -2,6 +2,7 @@ from .academicearth import AcademicEarthCourseIE
 from .addanime import AddAnimeIE
 from .aftonbladet import AftonbladetIE
 from .anitube import AnitubeIE
 from .addanime import AddAnimeIE
 from .aftonbladet import AftonbladetIE
 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


@@ -13,6 +14,7 @@ from .arte import (
     ArteTVConcertIE,
     ArteTVFutureIE,
     ArteTVDDCIE,
     ArteTVConcertIE,
     ArteTVFutureIE,
     ArteTVDDCIE,

+    ArteTVEmbedIE,

 )
 from .auengine import AUEngineIE
 from .bambuser import BambuserIE, BambuserChannelIE
 )
 from .auengine import AUEngineIE
 from .bambuser import BambuserIE, BambuserChannelIE


@@ -24,6 +26,7 @@ from .bloomberg import BloombergIE
 from .br import BRIE
 from .breakcom import BreakIE
 from .brightcove import BrightcoveIE
 from .br import BRIE
 from .breakcom import BreakIE
 from .brightcove import BrightcoveIE

+from .byutv import BYUtvIE

 from .c56 import C56IE
 from .canal13cl import Canal13clIE
 from .canalplus import CanalplusIE
 from .c56 import C56IE
 from .canal13cl import Canal13clIE
 from .canalplus import CanalplusIE


@@ -64,6 +67,7 @@ from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE
 from .elpais import ElPaisIE
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE
 from .elpais import ElPaisIE

+from .engadget import EngadgetIE

 from .escapist import EscapistIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE
 from .escapist import EscapistIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE


@@ -72,6 +76,7 @@ from .facebook import FacebookIE
 from .faz import FazIE
 from .firstpost import FirstpostIE
 from .firsttv import FirstTVIE
 from .faz import FazIE
 from .firstpost import FirstpostIE
 from .firsttv import FirstTVIE

+from .fivemin import FiveMinIE

 from .fktv import (
     FKTVIE,
     FKTVPosteckeIE,
 from .fktv import (
     FKTVIE,
     FKTVPosteckeIE,


@@ -109,7 +114,7 @@ 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 .iprima import IPrimaIE
 from .ivi import (
 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE
 from .ivi import (


@@ -192,6 +197,7 @@ from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtlnow import RTLnowIE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtlnow import RTLnowIE

+from .rts import RTSIE

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


@@ -202,7 +208,6 @@ from .rutv import RUTVIE
 from .savefrom import SaveFromIE
 from .servingsys import ServingSysIE
 from .sina import SinaIE
 from .savefrom import SaveFromIE
 from .servingsys import ServingSysIE
 from .sina import SinaIE

-from .slashdot import SlashdotIE

 from .slideshare import SlideshareIE
 from .smotri import (
     SmotriIE,
 from .slideshare import SlideshareIE
 from .smotri import (
     SmotriIE,


@@ -236,7 +241,7 @@ from .theplatform import ThePlatformIE
 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE
 from .toutv import TouTvIE
 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE
 from .toutv import TouTvIE

-from .toypics import ToypicsIE
+from .toypics import ToypicsUserIE, ToypicsIE

 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE
 from .trutube import TruTubeIE
 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE
 from .trutube import TruTubeIE


@@ -257,7 +262,6 @@ 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 .vice import ViceIE

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


@@ -276,16 +280,18 @@ from .vine import VineIE
 from .viki import VikiIE
 from .vk import VKIE
 from .vube import VubeIE
 from .viki import VikiIE
 from .vk import VKIE
 from .vube import VubeIE

+from .washingtonpost import WashingtonPostIE

 from .wat import WatIE
 from .wdr import WDRIE
 from .weibo import WeiboIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .wat import WatIE
 from .wdr import WDRIE
 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,