Merge pull request #9400 from inondle/master

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

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index c234ff12732f21ce84bb4f595404e797971fff79..14b4f245f1c65e06dea742805cda05f42444bf2b 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -46,6 +46,7 @@ from .arte import (
     ArteTVPlus7IE,
     ArteTVCreativeIE,
     ArteTVConcertIE,
     ArteTVPlus7IE,
     ArteTVCreativeIE,
     ArteTVConcertIE,

+    ArteTVInfoIE,

     ArteTVFutureIE,
     ArteTVCinemaIE,
     ArteTVDDCIE,
     ArteTVFutureIE,
     ArteTVCinemaIE,
     ArteTVDDCIE,


@@ -74,6 +75,7 @@ from .bigflix import BigflixIE
 from .bild import BildIE
 from .bilibili import BiliBiliIE
 from .biobiochiletv import BioBioChileTVIE
 from .bild import BildIE
 from .bilibili import BiliBiliIE
 from .biobiochiletv import BioBioChileTVIE

+from .biqle import BIQLEIE

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


@@ -156,6 +158,7 @@ from .cspan import CSpanIE
 from .ctsnews import CtsNewsIE
 from .cultureunplugged import CultureUnpluggedIE
 from .cwtv import CWTVIE
 from .ctsnews import CtsNewsIE
 from .cultureunplugged import CultureUnpluggedIE
 from .cwtv import CWTVIE

+from .dailymail import DailyMailIE

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


@@ -192,10 +195,10 @@ from .drbonanza import DRBonanzaIE
 from .drtuber import DrTuberIE
 from .drtv import DRTVIE
 from .dvtv import DVTVIE
 from .drtuber import DrTuberIE
 from .drtv import DRTVIE
 from .dvtv import DVTVIE

-from .dump import DumpIE

 from .dumpert import DumpertIE
 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE
 from .dumpert import DumpertIE
 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE

+from .dispeak import DigitallySpeakingIE

 from .dropbox import DropboxIE
 from .dw import (
     DWIE,
 from .dropbox import DropboxIE
 from .dw import (
     DWIE,


@@ -336,7 +339,6 @@ from .ivi import (
 )
 from .ivideon import IvideonIE
 from .izlesene import IzleseneIE
 )
 from .ivideon import IvideonIE
 from .izlesene import IzleseneIE

-from .jadorecettepub import JadoreCettePubIE

 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 from .jwplatform import JWPlatformIE
 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 from .jwplatform import JWPlatformIE


@@ -400,19 +402,24 @@ from .macgamestore import MacGameStoreIE
 from .mailru import MailRuIE
 from .makerschannel import MakersChannelIE
 from .makertv import MakerTVIE
 from .mailru import MailRuIE
 from .makerschannel import MakersChannelIE
 from .makertv import MakerTVIE

-from .malemotion import MalemotionIE

 from .matchtv import MatchTVIE
 from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mgoon import MgoonIE
 from .matchtv import MatchTVIE
 from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mgoon import MgoonIE

+from .mgtv import MGTVIE

 from .minhateca import MinhatecaIE
 from .ministrygrid import MinistryGridIE
 from .minoto import MinotoIE
 from .miomio import MioMioIE
 from .mit import TechTVMITIE, MITIE, OCWMITIE
 from .mitele import MiTeleIE
 from .minhateca import MinhatecaIE
 from .ministrygrid import MinistryGridIE
 from .minoto import MinotoIE
 from .miomio import MioMioIE
 from .mit import TechTVMITIE, MITIE, OCWMITIE
 from .mitele import MiTeleIE

-from .mixcloud import MixcloudIE
+from .mixcloud import (
+    MixcloudIE,
+    MixcloudUserIE,
+    MixcloudPlaylistIE,
+    MixcloudStreamIE,
+)

 from .mlb import MLBIE
 from .mnet import MnetIE
 from .mpora import MporaIE
 from .mlb import MLBIE
 from .mnet import MnetIE
 from .mpora import MporaIE


@@ -420,7 +427,6 @@ from .moevideo import MoeVideoIE
 from .mofosex import MofosexIE
 from .mojvideo import MojvideoIE
 from .moniker import MonikerIE
 from .mofosex import MofosexIE
 from .mojvideo import MojvideoIE
 from .moniker import MonikerIE

-from .mooshare import MooshareIE

 from .morningstar import MorningstarIE
 from .motherless import MotherlessIE
 from .motorsport import MotorsportIE
 from .morningstar import MorningstarIE
 from .motherless import MotherlessIE
 from .motorsport import MotorsportIE


@@ -434,8 +440,7 @@ from .mtv import (
 )
 from .muenchentv import MuenchenTVIE
 from .musicplayon import MusicPlayOnIE
 )
 from .muenchentv import MuenchenTVIE
 from .musicplayon import MusicPlayOnIE

-from .muzu import MuzuTVIE
-from .mwave import MwaveIE
+from .mwave import MwaveIE, MwaveMeetGreetIE

 from .myspace import MySpaceIE, MySpaceAlbumIE
 from .myspass import MySpassIE
 from .myvi import MyviIE
 from .myspace import MySpaceIE, MySpaceAlbumIE
 from .myspass import MySpassIE
 from .myvi import MyviIE


@@ -465,7 +470,6 @@ from .ndr import (
 from .ndtv import NDTVIE
 from .netzkino import NetzkinoIE
 from .nerdcubed import NerdCubedFeedIE
 from .ndtv import NDTVIE
 from .netzkino import NetzkinoIE
 from .nerdcubed import NerdCubedFeedIE

-from .nerdist import NerdistIE

 from .neteasemusic import (
     NetEaseMusicIE,
     NetEaseMusicAlbumIE,
 from .neteasemusic import (
     NetEaseMusicIE,
     NetEaseMusicAlbumIE,


@@ -486,9 +490,10 @@ 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 (

-    NHLIE,
-    NHLNewsIE,

     NHLVideocenterIE,
     NHLVideocenterIE,

+    NHLNewsIE,
+    NHLVideocenterCategoryIE,
+    NHLIE,

 )
 from .nick import NickIE
 from .niconico import NiconicoIE, NiconicoPlaylistIE
 )
 from .nick import NickIE
 from .niconico import NiconicoIE, NiconicoPlaylistIE


@@ -556,12 +561,15 @@ 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

-from .periscope import PeriscopeIE
+from .people import PeopleIE
+from .periscope import (
+    PeriscopeIE,
+    PeriscopeUserIE,
+)

 from .philharmoniedeparis import PhilharmonieDeParisIE
 from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE
 from .pinkbike import PinkbikeIE
 from .philharmoniedeparis import PhilharmonieDeParisIE
 from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE
 from .pinkbike import PinkbikeIE

-from .planetaplay import PlanetaPlayIE

 from .pladform import PladformIE
 from .played import PlayedIE
 from .playfm import PlayFMIE
 from .pladform import PladformIE
 from .played import PlayedIE
 from .playfm import PlayFMIE


@@ -597,7 +605,6 @@ from .qqmusic import (
     QQMusicToplistIE,
     QQMusicPlaylistIE,
 )
     QQMusicToplistIE,
     QQMusicPlaylistIE,
 )

-from .quickvid import QuickVidIE

 from .r7 import R7IE
 from .radiode import RadioDeIE
 from .radiojavan import RadioJavanIE
 from .r7 import R7IE
 from .radiode import RadioDeIE
 from .radiojavan import RadioJavanIE


@@ -655,7 +662,6 @@ from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE
 from .senateisvp import SenateISVPIE
 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .senateisvp import SenateISVPIE
 from .servingsys import ServingSysIE
 from .sexu import SexuIE

-from .sexykarma import SexyKarmaIE

 from .shahid import ShahidIE
 from .shared import SharedIE
 from .sharesix import ShareSixIE
 from .shahid import ShahidIE
 from .shared import SharedIE
 from .sharesix import ShareSixIE


@@ -672,10 +678,6 @@ from .smotri import (
     SmotriUserIE,
     SmotriBroadcastIE,
 )
     SmotriUserIE,
     SmotriBroadcastIE,
 )

-from .snagfilms import (
-    SnagFilmsIE,
-    SnagFilmsEmbedIE,
-)

 from .snotr import SnotrIE
 from .sohu import SohuIE
 from .soundcloud import (
 from .snotr import SnotrIE
 from .sohu import SohuIE
 from .soundcloud import (


@@ -727,9 +729,13 @@ from .svt import (
 from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE
 from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE

-from .tagesschau import TagesschauIE
+from .tagesschau import (
+    TagesschauPlayerIE,
+    TagesschauIE,
+)

 from .tapely import TapelyIE
 from .tass import TassIE
 from .tapely import TapelyIE
 from .tass import TassIE

+from .tdslifeway import TDSLifewayIE

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


@@ -747,7 +753,6 @@ from .teletask import TeleTaskIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .theintercept import TheInterceptIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .theintercept import TheInterceptIE

-from .theonion import TheOnionIE

 from .theplatform import (
     ThePlatformIE,
     ThePlatformFeedIE,
 from .theplatform import (
     ThePlatformIE,
     ThePlatformFeedIE,


@@ -832,7 +837,6 @@ from .twitter import (
     TwitterIE,
     TwitterAmplifyIE,
 )
     TwitterIE,
     TwitterAmplifyIE,
 )

-from .ubu import UbuIE

 from .udemy import (
     UdemyIE,
     UdemyCourseIE
 from .udemy import (
     UdemyIE,
     UdemyCourseIE


@@ -850,7 +854,10 @@ from .veehd import VeeHDIE
 from .veoh import VeohIE
 from .vessel import VesselIE
 from .vesti import VestiIE
 from .veoh import VeohIE
 from .vessel import VesselIE
 from .vesti import VestiIE

-from .vevo import VevoIE
+from .vevo import (
+    VevoIE,
+    VevoPlaylistIE,
+)

 from .vgtv import (
     BTArticleIE,
     BTVestlendingenIE,
 from .vgtv import (
     BTArticleIE,
     BTVestlendingenIE,


@@ -879,6 +886,10 @@ from .vidme import (
 )
 from .vidzi import VidziIE
 from .vier import VierIE, VierVideosIE
 )
 from .vidzi import VidziIE
 from .vier import VierIE, VierVideosIE

+from .viewlift import (
+    ViewLiftIE,
+    ViewLiftEmbedIE,
+)

 from .viewster import ViewsterIE
 from .viidea import ViideaIE
 from .vimeo import (
 from .viewster import ViewsterIE
 from .viidea import ViideaIE
 from .vimeo import (


@@ -917,7 +928,7 @@ from .vulture import VultureIE
 from .walla import WallaIE
 from .washingtonpost import WashingtonPostIE
 from .wat import WatIE
 from .walla import WallaIE
 from .washingtonpost import WashingtonPostIE
 from .wat import WatIE

-from .wayofthemaster import WayOfTheMasterIE
+from .watchindianporn import WatchIndianPornIE

 from .wdr import (
     WDRIE,
     WDRMobileIE,
 from .wdr import (
     WDRIE,
     WDRMobileIE,


@@ -941,6 +952,12 @@ from .xhamster import (
     XHamsterIE,
     XHamsterEmbedIE,
 )
     XHamsterIE,
     XHamsterEmbedIE,
 )

+from .xiami import (
+    XiamiSongIE,
+    XiamiAlbumIE,
+    XiamiArtistIE,
+    XiamiCollectionIE
+)

 from .xminus import XMinusIE
 from .xnxx import XNXXIE
 from .xstream import XstreamIE
 from .xminus import XMinusIE
 from .xnxx import XNXXIE
 from .xstream import XstreamIE