Merge branch 'akamai_pv' of https://github.com/remitamine/youtube-dl into remitamine...

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

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index c2fa83918f1b86a98692cf8f26298eb478610d41..6de3438fc8993e2f789494f951822a0d06850880 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,


@@ -123,6 +124,7 @@ from .chirbit import (
 )
 from .cinchcast import CinchcastIE
 from .cinemassacre import CinemassacreIE
 )
 from .cinchcast import CinchcastIE
 from .cinemassacre import CinemassacreIE

+from .cliprs import ClipRsIE

 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .clipsyndicate import ClipsyndicateIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .clipsyndicate import ClipsyndicateIE


@@ -191,10 +193,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,


@@ -335,7 +337,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


@@ -405,13 +406,19 @@ from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mgoon import MgoonIE
 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


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


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


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


@@ -555,12 +561,12 @@ 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 .people import PeopleIE

 from .periscope import PeriscopeIE
 from .philharmoniedeparis import PhilharmonieDeParisIE
 from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE
 from .pinkbike import PinkbikeIE
 from .periscope import PeriscopeIE
 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


@@ -596,7 +602,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


@@ -729,6 +734,7 @@ from .sztvhu import SztvHuIE
 from .tagesschau import TagesschauIE
 from .tapely import TapelyIE
 from .tass import TassIE
 from .tagesschau import TagesschauIE
 from .tapely import TapelyIE
 from .tass import TassIE

+from .tdslifeway import TDSLifewayIE

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


@@ -746,7 +752,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,


@@ -831,7 +836,6 @@ from .twitter import (
     TwitterIE,
     TwitterAmplifyIE,
 )
     TwitterIE,
     TwitterAmplifyIE,
 )

-from .ubu import UbuIE

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


@@ -916,7 +920,6 @@ 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 .wdr import (
     WDRIE,
     WDRMobileIE,
 from .wdr import (
     WDRIE,
     WDRMobileIE,