New upstream version 2019.01.16

[youtubedl] / youtube_dl / extractor / extractors.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 3b3964c0112737c0ea4c62165ffc02b0633de198..de38c6641acb6730c73d3d3975ed2faca1e70914 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -54,6 +54,7 @@ from .appletrailers import (
 from .archiveorg import ArchiveOrgIE
 from .arkena import ArkenaIE
 from .ard import (
 from .archiveorg import ArchiveOrgIE
 from .arkena import ArkenaIE
 from .ard import (

+    ARDBetaMediathekIE,

     ARDIE,
     ARDMediathekIE,
 )
     ARDIE,
     ARDMediathekIE,
 )


@@ -87,11 +88,7 @@ from .awaan import (
     AWAANLiveIE,
     AWAANSeasonIE,
 )
     AWAANLiveIE,
     AWAANSeasonIE,
 )

-from .azmedien import (
-    AZMedienIE,
-    AZMedienPlaylistIE,
-    AZMedienShowPlaylistIE,
-)
+from .azmedien import AZMedienIE

 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE, BandcampWeeklyIE
 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE, BandcampWeeklyIE


@@ -118,6 +115,10 @@ from .bilibili import (
     BiliBiliBangumiIE,
 )
 from .biobiochiletv import BioBioChileTVIE
     BiliBiliBangumiIE,
 )
 from .biobiochiletv import BioBioChileTVIE

+from .bitchute import (
+    BitChuteIE,
+    BitChuteChannelIE,
+)

 from .biqle import BIQLEIE
 from .bleacherreport import (
     BleacherReportIE,
 from .biqle import BIQLEIE
 from .bleacherreport import (
     BleacherReportIE,


@@ -193,6 +194,10 @@ from .chirbit import (
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE

+from .ciscolive import (
+    CiscoLiveSessionIE,
+    CiscoLiveSearchIE,
+)

 from .cjsw import CJSWIE
 from .cliphunter import CliphunterIE
 from .clippit import ClippitIE
 from .cjsw import CJSWIE
 from .cliphunter import CliphunterIE
 from .clippit import ClippitIE


@@ -204,7 +209,10 @@ from .cloudy import CloudyIE
 from .clubic import ClubicIE
 from .clyp import ClypIE
 from .cmt import CMTIE
 from .clubic import ClubicIE
 from .clyp import ClypIE
 from .cmt import CMTIE

-from .cnbc import CNBCIE
+from .cnbc import (
+    CNBCIE,
+    CNBCVideoIE,
+)

 from .cnn import (
     CNNIE,
     CNNBlogsIE,
 from .cnn import (
     CNNIE,
     CNNBlogsIE,


@@ -373,7 +381,6 @@ from .foxgay import FoxgayIE
 from .foxnews import (
     FoxNewsIE,
     FoxNewsArticleIE,
 from .foxnews import (
     FoxNewsIE,
     FoxNewsArticleIE,

-    FoxNewsInsiderIE,

 )
 from .foxsports import FoxSportsIE
 from .franceculture import FranceCultureIE
 )
 from .foxsports import FoxSportsIE
 from .franceculture import FranceCultureIE


@@ -391,6 +398,11 @@ from .francetv import (
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 from .freshlive import FreshLiveIE
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 from .freshlive import FreshLiveIE

+from .frontendmasters import (
+    FrontendMastersIE,
+    FrontendMastersLessonIE,
+    FrontendMastersCourseIE
+)

 from .funimation import FunimationIE
 from .funk import (
     FunkMixIE,
 from .funimation import FunimationIE
 from .funk import (
     FunkMixIE,


@@ -399,6 +411,7 @@ from .funk import (
 from .funnyordie import FunnyOrDieIE
 from .fusion import FusionIE
 from .fxnetworks import FXNetworksIE
 from .funnyordie import FunnyOrDieIE
 from .fusion import FusionIE
 from .fxnetworks import FXNetworksIE

+from .gaia import GaiaIE

 from .gameinformer import GameInformerIE
 from .gameone import (
     GameOneIE,
 from .gameinformer import GameInformerIE
 from .gameone import (
     GameOneIE,


@@ -457,6 +470,10 @@ from .hrti import (
 )
 from .huajiao import HuajiaoIE
 from .huffpost import HuffPostIE
 )
 from .huajiao import HuajiaoIE
 from .huffpost import HuffPostIE

+from .hungama import (
+    HungamaIE,
+    HungamaSongIE,
+)

 from .hypem import HypemIE
 from .iconosquare import IconosquareIE
 from .ign import (
 from .hypem import HypemIE
 from .iconosquare import IconosquareIE
 from .ign import (


@@ -471,6 +488,7 @@ from .imdb import (
 from .imgur import (
     ImgurIE,
     ImgurAlbumIE,
 from .imgur import (
     ImgurIE,
     ImgurAlbumIE,

+    ImgurGalleryIE,

 )
 from .ina import InaIE
 from .inc import IncIE
 )
 from .ina import InaIE
 from .inc import IncIE


@@ -512,6 +530,7 @@ from .keezmovies import KeezMoviesIE
 from .ketnet import KetnetIE
 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .ketnet import KetnetIE
 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE

+from .kinopoisk import KinoPoiskIE

 from .keek import KeekIE
 from .konserthusetplay import KonserthusetPlayIE
 from .kontrtube import KontrTubeIE
 from .keek import KeekIE
 from .konserthusetplay import KonserthusetPlayIE
 from .kontrtube import KontrTubeIE


@@ -530,6 +549,7 @@ from .la7 import LA7IE
 from .laola1tv import (
     Laola1TvEmbedIE,
     Laola1TvIE,
 from .laola1tv import (
     Laola1TvEmbedIE,
     Laola1TvIE,

+    EHFTVIE,

     ITTFIE,
 )
 from .lci import LCIIE
     ITTFIE,
 )
 from .lci import LCIIE


@@ -539,6 +559,11 @@ from .lcp import (
 )
 from .learnr import LearnrIE
 from .lecture2go import Lecture2GoIE
 )
 from .learnr import LearnrIE
 from .lecture2go import Lecture2GoIE

+from .lecturio import (
+    LecturioIE,
+    LecturioCourseIE,
+    LecturioDeCourseIE,
+)

 from .leeco import (
     LeIE,
     LePlaylistIE,
 from .leeco import (
     LeIE,
     LePlaylistIE,


@@ -559,6 +584,10 @@ from .limelight import (
     LimelightChannelListIE,
 )
 from .line import LineTVIE
     LimelightChannelListIE,
 )
 from .line import LineTVIE

+from .linkedin import (
+    LinkedInLearningIE,
+    LinkedInLearningCourseIE,
+)

 from .litv import LiTVIE
 from .liveleak import (
     LiveLeakIE,
 from .litv import LiTVIE
 from .liveleak import (
     LiveLeakIE,


@@ -658,11 +687,7 @@ from .myvi import (
     MyviEmbedIE,
 )
 from .myvidster import MyVidsterIE
     MyviEmbedIE,
 )
 from .myvidster import MyVidsterIE

-from .nationalgeographic import (
-    NationalGeographicVideoIE,
-    NationalGeographicIE,
-    NationalGeographicEpisodeGuideIE,
-)
+from .nationalgeographic import NationalGeographicVideoIE

 from .naver import NaverIE
 from .nba import NBAIE
 from .nbc import (
 from .naver import NaverIE
 from .nba import NBAIE
 from .nbc import (


@@ -732,7 +757,10 @@ from .nonktube import NonkTubeIE
 from .noovo import NoovoIE
 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE
 from .noovo import NoovoIE
 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE

-from .nova import NovaIE
+from .nova import (
+    NovaEmbedIE,
+    NovaIE,
+)

 from .novamov import (
     AuroraVidIE,
     CloudTimeIE,
 from .novamov import (
     AuroraVidIE,
     CloudTimeIE,


@@ -764,7 +792,9 @@ from .nrk import (
     NRKSkoleIE,
     NRKTVIE,
     NRKTVDirekteIE,
     NRKSkoleIE,
     NRKTVIE,
     NRKTVDirekteIE,

+    NRKTVEpisodeIE,

     NRKTVEpisodesIE,
     NRKTVEpisodesIE,

+    NRKTVSeasonIE,

     NRKTVSeriesIE,
 )
 from .ntvde import NTVDeIE
     NRKTVSeriesIE,
 )
 from .ntvde import NTVDeIE


@@ -799,6 +829,7 @@ from .orf import (
     ORFOE1IE,
     ORFIPTVIE,
 )
     ORFOE1IE,
     ORFIPTVIE,
 )

+from .outsidetv import OutsideTVIE

 from .packtpub import (
     PacktPubIE,
     PacktPubCourseIE,
 from .packtpub import (
     PacktPubIE,
     PacktPubCourseIE,


@@ -827,6 +858,7 @@ from .piksel import PikselIE
 from .pinkbike import PinkbikeIE
 from .pladform import PladformIE
 from .playfm import PlayFMIE
 from .pinkbike import PinkbikeIE
 from .pladform import PladformIE
 from .playfm import PlayFMIE

+from .playplustv import PlayPlusTVIE

 from .plays import PlaysTVIE
 from .playtvak import PlaytvakIE
 from .playvid import PlayvidIE
 from .plays import PlaysTVIE
 from .playtvak import PlaytvakIE
 from .playvid import PlayvidIE


@@ -854,6 +886,10 @@ from .pornhub import (
 from .pornotube import PornotubeIE
 from .pornovoisines import PornoVoisinesIE
 from .pornoxo import PornoXOIE
 from .pornotube import PornotubeIE
 from .pornovoisines import PornoVoisinesIE
 from .pornoxo import PornoXOIE

+from .puhutv import (
+    PuhuTVIE,
+    PuhuTVSerieIE,
+)

 from .presstv import PressTVIE
 from .primesharetv import PrimeShareTVIE
 from .promptfile import PromptFileIE
 from .presstv import PressTVIE
 from .primesharetv import PrimeShareTVIE
 from .promptfile import PromptFileIE


@@ -885,7 +921,10 @@ from .rai import (
     RaiPlayPlaylistIE,
     RaiIE,
 )
     RaiPlayPlaylistIE,
     RaiIE,
 )

-from .raywenderlich import RayWenderlichIE
+from .raywenderlich import (
+    RayWenderlichIE,
+    RayWenderlichCourseIE,
+)

 from .rbmaradio import RBMARadioIE
 from .rds import RDSIE
 from .redbulltv import RedBullTVIE
 from .rbmaradio import RBMARadioIE
 from .rds import RDSIE
 from .redbulltv import RedBullTVIE


@@ -1021,7 +1060,7 @@ from .spike import (
 )
 from .stitcher import StitcherIE
 from .sport5 import Sport5IE
 )
 from .stitcher import StitcherIE
 from .sport5 import Sport5IE

-from .sportbox import SportBoxEmbedIE
+from .sportbox import SportBoxIE

 from .sportdeutschland import SportDeutschlandIE
 from .springboardplatform import SpringboardPlatformIE
 from .sprout import SproutIE
 from .sportdeutschland import SportDeutschlandIE
 from .springboardplatform import SpringboardPlatformIE
 from .sprout import SproutIE


@@ -1041,6 +1080,7 @@ from .stretchinternet import StretchInternetIE
 from .sunporno import SunPornoIE
 from .svt import (
     SVTIE,
 from .sunporno import SunPornoIE
 from .svt import (
     SVTIE,

+    SVTPageIE,

     SVTPlayIE,
     SVTSeriesIE,
 )
     SVTPlayIE,
     SVTSeriesIE,
 )


@@ -1055,6 +1095,10 @@ from .tass import TassIE
 from .tastytrade import TastyTradeIE
 from .tbs import TBSIE
 from .tdslifeway import TDSLifewayIE
 from .tastytrade import TastyTradeIE
 from .tbs import TBSIE
 from .tdslifeway import TDSLifewayIE

+from .teachable import (
+    TeachableIE,
+    TeachableCourseIE,
+)

 from .teachertube import (
     TeacherTubeIE,
     TeacherTubeUserIE,
 from .teachertube import (
     TeacherTubeIE,
     TeacherTubeUserIE,


@@ -1063,6 +1107,7 @@ from .teachingchannel import TeachingChannelIE
 from .teamcoco import TeamcocoIE
 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .teamcoco import TeamcocoIE
 from .techtalks import TechTalksIE
 from .ted import TEDIE

+from .tele5 import Tele5IE

 from .tele13 import Tele13IE
 from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE
 from .tele13 import Tele13IE
 from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE


@@ -1092,6 +1137,10 @@ from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE
 from .thisoldhouse import ThisOldHouseIE
 from .threeqsdn import ThreeQSDNIE
 from .thisav import ThisAVIE
 from .thisoldhouse import ThisOldHouseIE
 from .threeqsdn import ThreeQSDNIE

+from .tiktok import (
+    TikTokIE,
+    TikTokUserIE,
+)

 from .tinypic import TinyPicIE
 from .tmz import (
     TMZIE,
 from .tinypic import TinyPicIE
 from .tmz import (
     TMZIE,


@@ -1129,7 +1178,6 @@ from .tv2 import (
     TV2ArticleIE,
 )
 from .tv2hu import TV2HuIE
     TV2ArticleIE,
 )
 from .tv2hu import TV2HuIE

-from .tv3 import TV3IE

 from .tv4 import TV4IE
 from .tv5mondeplus import TV5MondePlusIE
 from .tva import TVAIE
 from .tv4 import TV4IE
 from .tv5mondeplus import TV5MondePlusIE
 from .tva import TVAIE


@@ -1148,7 +1196,9 @@ from .tvnet import TVNetIE
 from .tvnoe import TVNoeIE
 from .tvnow import (
     TVNowIE,
 from .tvnoe import TVNoeIE
 from .tvnow import (
     TVNowIE,

-    TVNowListIE,
+    TVNowNewIE,
+    TVNowSeasonIE,
+    TVNowAnnualIE,

     TVNowShowIE,
 )
 from .tvp import (
     TVNowShowIE,
 )
 from .tvp import (


@@ -1159,12 +1209,14 @@ from .tvp import (
 from .tvplay import (
     TVPlayIE,
     ViafreeIE,
 from .tvplay import (
     TVPlayIE,
     ViafreeIE,

+    TVPlayHomeIE,

 )
 from .tvplayer import TVPlayerIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE
 from .twentymin import TwentyMinutenIE
 from .twentythreevideo import TwentyThreeVideoIE
 )
 from .tvplayer import TVPlayerIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE
 from .twentymin import TwentyMinutenIE
 from .twentythreevideo import TwentyThreeVideoIE

+from .twitcasting import TwitCastingIE

 from .twitch import (
     TwitchVideoIE,
     TwitchChapterIE,
 from .twitch import (
     TwitchVideoIE,
     TwitchChapterIE,


@@ -1198,10 +1250,6 @@ from .uplynk import (
     UplynkIE,
     UplynkPreplayIE,
 )
     UplynkIE,
     UplynkPreplayIE,
 )

-from .upskill import (
-    UpskillIE,
-    UpskillCourseIE,
-)

 from .urort import UrortIE
 from .urplay import URPlayIE
 from .usanetwork import USANetworkIE
 from .urort import UrortIE
 from .urplay import URPlayIE
 from .usanetwork import USANetworkIE


@@ -1270,6 +1318,7 @@ from .vimeo import (
     VimeoReviewIE,
     VimeoUserIE,
     VimeoWatchLaterIE,
     VimeoReviewIE,
     VimeoUserIE,
     VimeoWatchLaterIE,

+    VHXEmbedIE,

 )
 from .vimple import VimpleIE
 from .vine import (
 )
 from .vimple import VimpleIE
 from .vine import (


@@ -1280,6 +1329,7 @@ from .viki import (
     VikiIE,
     VikiChannelIE,
 )
     VikiIE,
     VikiChannelIE,
 )

+from .viqeo import ViqeoIE

 from .viu import (
     ViuIE,
     ViuPlaylistIE,
 from .viu import (
     ViuIE,
     ViuPlaylistIE,


@@ -1356,6 +1406,7 @@ from .wsj import (
     WSJIE,
     WSJArticleIE,
 )
     WSJIE,
     WSJArticleIE,
 )

+from .wwe import WWEIE

 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .xfileshare import XFileShareIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .xfileshare import XFileShareIE


@@ -1405,6 +1456,7 @@ from .younow import (
     YouNowMomentIE,
 )
 from .youporn import YouPornIE
     YouNowMomentIE,
 )
 from .youporn import YouPornIE

+from .yourporn import YourPornIE

 from .yourupload import YourUploadIE
 from .youtube import (
     YoutubeIE,
 from .yourupload import YourUploadIE
 from .youtube import (
     YoutubeIE,


@@ -1428,10 +1480,23 @@ from .youtube import (
 from .zapiks import ZapiksIE
 from .zaq1 import Zaq1IE
 from .zattoo import (
 from .zapiks import ZapiksIE
 from .zaq1 import Zaq1IE
 from .zattoo import (

+    BBVTVIE,
+    EinsUndEinsTVIE,
+    EWETVIE,
+    GlattvisionTVIE,
+    MNetTVIE,
+    MyVisionTVIE,
+    NetPlusIE,
+    OsnatelTVIE,
+    QuantumTVIE,

     QuicklineIE,
     QuicklineLiveIE,
     QuicklineIE,
     QuicklineLiveIE,

+    SAKTVIE,
+    VTXTVIE,
+    WalyTVIE,

     ZattooIE,
     ZattooLiveIE,
 )
 from .zdf import ZDFIE, ZDFChannelIE
 from .zingmp3 import ZingMp3IE
     ZattooIE,
     ZattooLiveIE,
 )
 from .zdf import ZDFIE, ZDFChannelIE
 from .zingmp3 import ZingMp3IE

+from .zype import ZypeIE