Merge pull request #2567 from jaimeMF/sphinx-docs

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index e6755151c1b3c7766331b8a87839f8929236c4f6..3e728e87606f5e08bb94a1a0fa36735b35cc3796 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,6 +11,7 @@ from .arte import (
     ArteTvIE,
     ArteTVPlus7IE,
     ArteTVCreativeIE,
     ArteTvIE,
     ArteTVPlus7IE,
     ArteTVCreativeIE,

+    ArteTVConcertIE,

     ArteTVFutureIE,
     ArteTVDDCIE,
 )
     ArteTVFutureIE,
     ArteTVDDCIE,
 )


@@ -52,7 +55,6 @@ 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


@@ -63,6 +65,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


@@ -71,6 +74,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,


@@ -108,7 +112,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 (


@@ -173,8 +177,10 @@ from .nowness import NownessIE
 from .nowvideo import NowVideoIE
 from .ooyala import OoyalaIE
 from .orf import ORFIE
 from .nowvideo import NowVideoIE
 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 .podomatic import PodomaticIE
 from .pornhd import PornHdIE
 from .pornhub import PornHubIE


@@ -195,6 +201,7 @@ from .rutube import (
     RutubeMovieIE,
     RutubePersonIE,
 )
     RutubeMovieIE,
     RutubePersonIE,
 )

+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


@@ -232,6 +239,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 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


@@ -241,6 +249,10 @@ 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 .udemy import (
+    UdemyIE,
+    UdemyCourseIE
+)

 from .unistra import UnistraIE
 from .ustream import UstreamIE, UstreamChannelIE
 from .vbox7 import Vbox7IE
 from .unistra import UnistraIE
 from .ustream import UstreamIE, UstreamChannelIE
 from .vbox7 import Vbox7IE


@@ -252,6 +264,7 @@ 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

+from .videolecturesnet import VideoLecturesNetIE

 from .videofyme import VideofyMeIE
 from .videopremium import VideoPremiumIE
 from .vimeo import (
 from .videofyme import VideofyMeIE
 from .videopremium import VideoPremiumIE
 from .vimeo import (


@@ -267,14 +280,16 @@ from .viki import VikiIE
 from .vk import VKIE
 from .vube import VubeIE
 from .wat import WatIE
 from .vk import VKIE
 from .vube import VubeIE
 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 .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,


@@ -285,19 +300,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