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 add1df02321520198a74c3a8fd078bb65d51f1db..aeb67354efdb77543544c1a9f112d6a183b84d8f 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -15,7 +15,7 @@ from .adobetv import (
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE

-from .aftenposten import AftenpostenIE
+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


@@ -26,7 +26,10 @@ from .aol import AolIE
 from .allocine import AllocineIE
 from .aparat import AparatIE
 from .appleconnect import AppleConnectIE
 from .allocine import AllocineIE
 from .aparat import AparatIE
 from .appleconnect import AppleConnectIE

-from .appletrailers import AppleTrailersIE
+from .appletrailers import (
+    AppleTrailersIE,
+    AppleTrailersSectionIE,
+)

 from .archiveorg import ArchiveOrgIE
 from .ard import (
     ARDIE,
 from .archiveorg import ArchiveOrgIE
 from .ard import (
     ARDIE,


@@ -59,8 +62,13 @@ 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 .bild import BildIE
 from .bilibili import BiliBiliIE

+from .bleacherreport import (
+    BleacherReportIE,
+    BleacherReportCMSIE,
+)

 from .blinkx import BlinkxIE
 from .bloomberg import BloombergIE
 from .bpb import BpbIE
 from .blinkx import BlinkxIE
 from .bloomberg import BloombergIE
 from .bpb import BpbIE


@@ -79,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


@@ -121,15 +130,25 @@ 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,
     DailymotionUserIE,
     DailymotionCloudIE,
 )
 from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,
     DailymotionUserIE,
     DailymotionCloudIE,
 )

-from .daum import DaumIE
+from .daum import (
+    DaumIE,
+    DaumClipIE,
+)

 from .dbtv import DBTVIE
 from .dbtv import DBTVIE

-from .dcn import DCNIE
+from .dcn import (
+    DCNIE,
+    DCNVideoIE,
+    DCNLiveIE,
+    DCNSeasonIE,
+)

 from .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE
 from .democracynow import DemocracynowIE
 from .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE
 from .democracynow import DemocracynowIE


@@ -189,10 +208,14 @@ from .flickr import FlickrIE
 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .fourtube import FourTubeIE
 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .fourtube import FourTubeIE

+from .fox import FOXIE

 from .foxgay import FoxgayIE
 from .foxnews import FoxNewsIE
 from .foxsports import FoxSportsIE
 from .foxgay import FoxgayIE
 from .foxnews import FoxNewsIE
 from .foxsports import FoxSportsIE

-from .franceculture import FranceCultureIE
+from .franceculture import (
+    FranceCultureIE,
+    FranceCultureEmissionIE,
+)

 from .franceinter import FranceInterIE
 from .francetv import (
     PluzzIE,
 from .franceinter import FranceInterIE
 from .francetv import (
     PluzzIE,


@@ -243,16 +266,20 @@ 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

+from .hotstar import HotStarIE

 from .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE
 from .huffpost import HuffPostIE
 from .hypem import HypemIE
 from .iconosquare import IconosquareIE
 from .howcast import HowcastIE
 from .howstuffworks import HowStuffWorksIE
 from .huffpost import HuffPostIE
 from .hypem import HypemIE
 from .iconosquare import IconosquareIE

-from .ign import IGNIE, OneUPIE
+from .ign import (
+    IGNIE,
+    OneUPIE,
+    PCMagIE,
+)

 from .imdb import (
     ImdbIE,
     ImdbListIE
 from .imdb import (
     ImdbIE,
     ImdbListIE


@@ -276,11 +303,11 @@ from .ivi import (
     IviIE,
     IviCompilationIE
 )
     IviIE,
     IviCompilationIE
 )

+from .ivideon import IvideonIE

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

-from .jukebox import JukeboxIE

 from .jwplatform import JWPlatformIE
 from .jpopsukitv import JpopsukiIE
 from .kaltura import KalturaIE
 from .jwplatform import JWPlatformIE
 from .jpopsukitv import JpopsukiIE
 from .kaltura import KalturaIE


@@ -309,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 (


@@ -412,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 (


@@ -419,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


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

+from .npr import NprIE

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


@@ -468,12 +499,14 @@ from .ooyala import (
     OoyalaIE,
     OoyalaExternalIE,
 )
     OoyalaIE,
     OoyalaExternalIE,
 )

+from .ora import OraTVIE

 from .orf import (
     ORFTVthekIE,
     ORFOE1IE,
     ORFFM4IE,
     ORFIPTVIE,
 )
 from .orf import (
     ORFTVthekIE,
     ORFOE1IE,
     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


@@ -521,18 +554,23 @@ from .radiode import RadioDeIE
 from .radiojavan import RadioJavanIE
 from .radiobremen import RadioBremenIE
 from .radiofrance import RadioFranceIE
 from .radiojavan import RadioJavanIE
 from .radiobremen import RadioBremenIE
 from .radiofrance import RadioFranceIE

-from .rai import RaiIE
+from .rai import (
+    RaiTVIE,
+    RaiIE,
+)

 from .rbmaradio import RBMARadioIE
 from .rds import RDSIE
 from .redtube import RedTubeIE
 from .rbmaradio import RBMARadioIE
 from .rds import RDSIE
 from .redtube import RedTubeIE

+from .regiotv import RegioTVIE

 from .restudy import RestudyIE
 from .reverbnation import ReverbNationIE
 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


@@ -587,10 +625,6 @@ from .snagfilms import (
 )
 from .snotr import SnotrIE
 from .sohu import SohuIE
 )
 from .snotr import SnotrIE
 from .sohu import SohuIE

-from .soompi import (
-    SoompiIE,
-    SoompiShowIE,
-)

 from .soundcloud import (
     SoundcloudIE,
     SoundcloudSetIE,
 from .soundcloud import (
     SoundcloudIE,
     SoundcloudSetIE,


@@ -622,7 +656,10 @@ from .sportbox import (
     SportBoxEmbedIE,
 )
 from .sportdeutschland import SportDeutschlandIE
     SportBoxEmbedIE,
 )
 from .sportdeutschland import SportDeutschlandIE

-from .srf import SrfIE
+from .srgssr import (
+    SRGSSRIE,
+    SRGSSRPlayIE,
+)

 from .srmediathek import SRMediathekIE
 from .ssa import SSAIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .srmediathek import SRMediathekIE
 from .ssa import SSAIE
 from .stanfordoc import StanfordOpenClassroomIE


@@ -657,8 +694,8 @@ 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 .tf1 import TF1IE

+from .theintercept import TheInterceptIE

 from .theonion import TheOnionIE
 from .theplatform import (
     ThePlatformIE,
 from .theonion import TheOnionIE
 from .theplatform import (
     ThePlatformIE,


@@ -668,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,


@@ -690,9 +727,19 @@ 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 .tumblr import TumblrIE

-from .tunein import TuneInIE
+from .tunein import (
+    TuneInClipIE,
+    TuneInStationIE,
+    TuneInProgramIE,
+    TuneInTopicIE,
+    TuneInShortenerIE,
+)

 from .turbo import TurboIE
 from .tutv import TutvIE
 from .tv2 import (
 from .turbo import TurboIE
 from .tutv import TutvIE
 from .tv2 import (


@@ -705,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


@@ -751,6 +800,11 @@ from .viddler import ViddlerIE
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
 from .videomega import VideoMegaIE
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
 from .videomega import VideoMegaIE

+from .videomore import (
+    VideomoreIE,
+    VideomoreVideoIE,
+    VideomoreSeasonIE,
+)

 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE
 from .vidme import VidmeIE
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE
 from .vidme import VidmeIE


@@ -803,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


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

+from .zippcast import ZippCastIE

 
 _ALL_CLASSES = [
     klass
 
 _ALL_CLASSES = [
     klass