Merge branch 'Weiqitv' of https://github.com/FounderSG/youtube-dl into FounderSG...

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index bae151e58cf411d160da690c3ce572cf9f585e0d..aeb67354efdb77543544c1a9f112d6a183b84d8f 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -15,6 +15,7 @@ from .adobetv import (
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE

+from .aenetworks import AENetworksIE

 from .aftonbladet import AftonbladetIE
 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE
 from .aftonbladet import AftonbladetIE
 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE


@@ -61,6 +62,7 @@ from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .beatportpro import BeatportProIE
 from .bet import BetIE
 from .behindkink import BehindKinkIE
 from .beatportpro import BeatportProIE
 from .bet import BetIE

+from .bigflix import BigflixIE

 from .bild import BildIE
 from .bilibili import BiliBiliIE
 from .bleacherreport import (
 from .bild import BildIE
 from .bilibili import BiliBiliIE
 from .bleacherreport import (


@@ -85,6 +87,7 @@ from .camdemy import (
 )
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 )
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE

+from .canvas import CanvasIE

 from .cbs import CBSIE
 from .cbsnews import CBSNewsIE
 from .cbssports import CBSSportsIE
 from .cbs import CBSIE
 from .cbsnews import CBSNewsIE
 from .cbssports import CBSSportsIE


@@ -127,6 +130,8 @@ from .crunchyroll import (
 )
 from .cspan import CSpanIE
 from .ctsnews import CtsNewsIE
 )
 from .cspan import CSpanIE
 from .ctsnews import CtsNewsIE

+from .cultureunplugged import CultureUnpluggedIE
+from .cwtv import CWTVIE

 from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,
 from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,


@@ -261,7 +266,6 @@ from .hellporno import HellPornoIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .historicfilms import HistoricFilmsIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .historicfilms import HistoricFilmsIE

-from .history import HistoryIE

 from .hitbox import HitboxIE, HitboxLiveIE
 from .hornbunny import HornBunnyIE
 from .hotnewhiphop import HotNewHipHopIE
 from .hitbox import HitboxIE, HitboxLiveIE
 from .hornbunny import HornBunnyIE
 from .hotnewhiphop import HotNewHipHopIE


@@ -299,6 +303,7 @@ from .ivi import (
     IviIE,
     IviCompilationIE
 )
     IviIE,
     IviCompilationIE
 )

+from .ivideon import IvideonIE

 from .izlesene import IzleseneIE
 from .jadorecettepub import JadoreCettePubIE
 from .jeuxvideo import JeuxVideoIE
 from .izlesene import IzleseneIE
 from .jadorecettepub import JadoreCettePubIE
 from .jeuxvideo import JeuxVideoIE


@@ -331,7 +336,8 @@ from .lecture2go import Lecture2GoIE
 from .letv import (
     LetvIE,
     LetvTvIE,
 from .letv import (
     LetvIE,
     LetvTvIE,

-    LetvPlaylistIE
+    LetvPlaylistIE,
+    LetvCloudIE,

 )
 from .libsyn import LibsynIE
 from .lifenews import (
 )
 from .libsyn import LibsynIE
 from .lifenews import (


@@ -434,6 +440,7 @@ from .nextmedia import (
     NextMediaActionNewsIE,
     AppleDailyIE,
 )
     NextMediaActionNewsIE,
     AppleDailyIE,
 )

+from .nextmovie import NextMovieIE

 from .nfb import NFBIE
 from .nfl import NFLIE
 from .nhl import (
 from .nfb import NFBIE
 from .nfl import NFLIE
 from .nhl import (


@@ -441,6 +448,7 @@ from .nhl import (
     NHLNewsIE,
     NHLVideocenterIE,
 )
     NHLNewsIE,
     NHLVideocenterIE,
 )

+from .nick import NickIE

 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninegag import NineGagIE
 from .noco import NocoIE
 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninegag import NineGagIE
 from .noco import NocoIE


@@ -471,6 +479,7 @@ from .npo import (
     VPROIE,
     WNLIE
 )
     VPROIE,
     WNLIE
 )

+from .npr import NprIE

 from .nrk import (
     NRKIE,
     NRKPlaylistIE,
 from .nrk import (
     NRKIE,
     NRKPlaylistIE,


@@ -497,6 +506,7 @@ from .orf import (
     ORFFM4IE,
     ORFIPTVIE,
 )
     ORFFM4IE,
     ORFIPTVIE,
 )

+from .pandoratv import PandoraTVIE

 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE
 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE


@@ -554,12 +564,13 @@ from .redtube import RedTubeIE
 from .regiotv import RegioTVIE
 from .restudy import RestudyIE
 from .reverbnation import ReverbNationIE
 from .regiotv import RegioTVIE
 from .restudy import RestudyIE
 from .reverbnation import ReverbNationIE

+from .revision3 import Revision3IE

 from .ringtv import RingTVIE
 from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtbf import RTBFIE
 from .ringtv import RingTVIE
 from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtbf import RTBFIE

-from .rte import RteIE
+from .rte import RteIE, RteRadioIE

 from .rtlnl import RtlNlIE
 from .rtl2 import RTL2IE
 from .rtp import RTPIE
 from .rtlnl import RtlNlIE
 from .rtl2 import RTL2IE
 from .rtp import RTPIE


@@ -683,7 +694,6 @@ from .telemb import TeleMBIE
 from .teletask import TeleTaskIE
 from .tenplay import TenPlayIE
 from .testurl import TestURLIE
 from .teletask import TeleTaskIE
 from .tenplay import TenPlayIE
 from .testurl import TestURLIE

-from .testtube import TestTubeIE

 from .tf1 import TF1IE
 from .theintercept import TheInterceptIE
 from .theonion import TheOnionIE
 from .tf1 import TF1IE
 from .theintercept import TheInterceptIE
 from .theonion import TheOnionIE


@@ -695,7 +705,7 @@ from .thesixtyone import TheSixtyOneIE
 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE
 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE

-from .tlc import TlcIE, TlcDeIE
+from .tlc import TlcDeIE

 from .tmz import (
     TMZIE,
     TMZArticleIE,
 from .tmz import (
     TMZIE,
     TMZArticleIE,


@@ -717,7 +727,11 @@ from .trilulilu import TriluliluIE
 from .trutube import TruTubeIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE
 from .trutube import TruTubeIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE

-from .tudou import TudouIE
+from .tudou import (
+    TudouIE,
+    TudouPlaylistIE,
+    TudouAlbumIE,
+)

 from .tumblr import TumblrIE
 from .tunein import (
     TuneInClipIE,
 from .tumblr import TumblrIE
 from .tunein import (
     TuneInClipIE,


@@ -738,10 +752,12 @@ from .tvc import (
     TVCArticleIE,
 )
 from .tvigle import TvigleIE
     TVCArticleIE,
 )
 from .tvigle import TvigleIE

+from .tvland import TVLandIE

 from .tvp import TvpIE, TvpSeriesIE
 from .tvplay import TVPlayIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE
 from .tvp import TvpIE, TvpSeriesIE
 from .tvplay import TVPlayIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE

+from .twentymin import TwentyMinutenIE

 from .twentytwotracks import (
     TwentyTwoTracksIE,
     TwentyTwoTracksGenreIE
 from .twentytwotracks import (
     TwentyTwoTracksIE,
     TwentyTwoTracksGenreIE


@@ -841,6 +857,7 @@ from .webofstories import (
     WebOfStoriesPlaylistIE,
 )
 from .weibo import WeiboIE
     WebOfStoriesPlaylistIE,
 )
 from .weibo import WeiboIE

+from .weiqitv import WeiqitvIE

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


@@ -901,6 +918,7 @@ from .zingmp3 import (
     ZingMp3SongIE,
     ZingMp3AlbumIE,
 )
     ZingMp3SongIE,
     ZingMp3AlbumIE,
 )

+from .zippcast import ZippCastIE

 
 _ALL_CLASSES = [
     klass
 
 _ALL_CLASSES = [
     klass