Merge pull request #7045 from remitamine/ign

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index ef6c7f0ded0fd498b4950542583008a722696d3e..165835f6385d75151e5938c4bc374535c5ac483b 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -3,13 +3,18 @@ from __future__ import unicode_literals
 from .abc import ABCIE
 from .abc7news import Abc7NewsIE
 from .academicearth import AcademicEarthCourseIE
 from .abc import ABCIE
 from .abc7news import Abc7NewsIE
 from .academicearth import AcademicEarthCourseIE

+from .acast import (
+    ACastIE,
+    ACastChannelIE,
+)

 from .addanime import AddAnimeIE
 from .adobetv import (
     AdobeTVIE,
 from .addanime import AddAnimeIE
 from .adobetv import (
     AdobeTVIE,

+    AdobeTVShowIE,
+    AdobeTVChannelIE,

     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE

-from .aftenposten import AftenpostenIE

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


@@ -20,7 +25,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,


@@ -38,6 +46,7 @@ from .arte import (
 )
 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE
 )
 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE

+from .audimedia import AudiMediaIE

 from .audiomack import AudiomackIE, AudiomackAlbumIE
 from .azubu import AzubuIE
 from .baidu import BaiduVideoIE
 from .audiomack import AudiomackIE, AudiomackAlbumIE
 from .azubu import AzubuIE
 from .baidu import BaiduVideoIE


@@ -54,13 +63,19 @@ from .beatportpro import BeatportProIE
 from .bet import BetIE
 from .bild import BildIE
 from .bilibili import BiliBiliIE
 from .bet import BetIE
 from .bild import BildIE
 from .bilibili import BiliBiliIE

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

 from .blinkx import BlinkxIE
 from .blinkx import BlinkxIE

-from .bliptv import BlipTVIE, BlipTVUserIE

 from .bloomberg import BloombergIE
 from .bpb import BpbIE
 from .br import BRIE
 from .breakcom import BreakIE
 from .bloomberg import BloombergIE
 from .bpb import BpbIE
 from .br import BRIE
 from .breakcom import BreakIE

-from .brightcove import BrightcoveIE
+from .brightcove import (
+    BrightcoveLegacyIE,
+    BrightcoveNewIE,
+)

 from .buzzfeed import BuzzFeedIE
 from .byutv import BYUtvIE
 from .c56 import C56IE
 from .buzzfeed import BuzzFeedIE
 from .byutv import BYUtvIE
 from .c56 import C56IE


@@ -68,7 +83,6 @@ from .camdemy import (
     CamdemyIE,
     CamdemyFolderIE
 )
     CamdemyIE,
     CamdemyFolderIE
 )

-from .canal13cl import Canal13clIE

 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .cbs import CBSIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .cbs import CBSIE


@@ -129,6 +143,7 @@ from .dfb import DFBIE
 from .dhm import DHMIE
 from .dotsub import DotsubIE
 from .douyutv import DouyuTVIE
 from .dhm import DHMIE
 from .dotsub import DotsubIE
 from .douyutv import DouyuTVIE

+from .dplay import DPlayIE

 from .dramafever import (
     DramaFeverIE,
     DramaFeverSeriesIE,
 from .dramafever import (
     DramaFeverIE,
     DramaFeverSeriesIE,


@@ -195,7 +210,9 @@ from .francetv import (
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 from .freevideo import FreeVideoIE
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 from .freevideo import FreeVideoIE

+from .funimation import FunimationIE

 from .funnyordie import FunnyOrDieIE
 from .funnyordie import FunnyOrDieIE

+from .gameinformer import GameInformerIE

 from .gamekings import GamekingsIE
 from .gameone import (
     GameOneIE,
 from .gamekings import GamekingsIE
 from .gameone import (
     GameOneIE,


@@ -219,10 +236,11 @@ from .globo import (
 from .godtube import GodTubeIE
 from .goldenmoustache import GoldenMoustacheIE
 from .golem import GolemIE
 from .godtube import GodTubeIE
 from .goldenmoustache import GoldenMoustacheIE
 from .golem import GolemIE

+from .googledrive import GoogleDriveIE

 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE

-from .gorillavid import GorillaVidIE

 from .goshgay import GoshgayIE
 from .goshgay import GoshgayIE

+from .gputechconf import GPUTechConfIE

 from .groupon import GrouponIE
 from .hark import HarkIE
 from .hearthisat import HearThisAtIE
 from .groupon import GrouponIE
 from .hark import HarkIE
 from .hearthisat import HearThisAtIE


@@ -235,12 +253,17 @@ 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


@@ -269,6 +292,7 @@ from .jadorecettepub import JadoreCettePubIE
 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 from .jukebox import JukeboxIE
 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 .kanalplay import KanalPlayIE
 from .jpopsukitv import JpopsukiIE
 from .kaltura import KalturaIE
 from .kanalplay import KanalPlayIE


@@ -323,6 +347,7 @@ from .lynda import (
 from .m6 import M6IE
 from .macgamestore import MacGameStoreIE
 from .mailru import MailRuIE
 from .m6 import M6IE
 from .macgamestore import MacGameStoreIE
 from .mailru import MailRuIE

+from .makertv import MakerTVIE

 from .malemotion import MalemotionIE
 from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .malemotion import MalemotionIE
 from .mdr import MDRIE
 from .metacafe import MetacafeIE


@@ -346,7 +371,6 @@ from .motherless import MotherlessIE
 from .motorsport import MotorsportIE
 from .movieclips import MovieClipsIE
 from .moviezine import MoviezineIE
 from .motorsport import MotorsportIE
 from .movieclips import MovieClipsIE
 from .moviezine import MoviezineIE

-from .movshare import MovShareIE

 from .mtv import (
     MTVIE,
     MTVServicesEmbeddedIE,
 from .mtv import (
     MTVIE,
     MTVServicesEmbeddedIE,


@@ -412,14 +436,22 @@ from .noco import NocoIE
 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE
 from .nova import NovaIE
 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE
 from .nova import NovaIE

-from .novamov import NovaMovIE
+from .novamov import (
+    NovaMovIE,
+    WholeCloudIE,
+    NowVideoIE,
+    VideoWeedIE,
+    CloudTimeIE,
+)

 from .nowness import (
     NownessIE,
     NownessPlaylistIE,
     NownessSeriesIE,
 )
 from .nowness import (
     NownessIE,
     NownessPlaylistIE,
     NownessSeriesIE,
 )

-from .nowtv import NowTVIE
-from .nowvideo import NowVideoIE
+from .nowtv import (
+    NowTVIE,
+    NowTVListIE,
+)

 from .npo import (
     NPOIE,
     NPOLiveIE,
 from .npo import (
     NPOIE,
     NPOLiveIE,


@@ -456,10 +488,7 @@ from .orf import (
 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,
-    QuickscopeIE,
-)
+from .periscope import PeriscopeIE

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


@@ -503,7 +532,10 @@ 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


@@ -551,6 +583,10 @@ from .shahid import ShahidIE
 from .shared import SharedIE
 from .sharesix import ShareSixIE
 from .sina import SinaIE
 from .shared import SharedIE
 from .sharesix import ShareSixIE
 from .sina import SinaIE

+from .skynewsarabia import (
+    SkyNewsArabiaIE,
+    SkyNewsArabiaArticleIE,
+)

 from .slideshare import SlideshareIE
 from .slutload import SlutloadIE
 from .smotri import (
 from .slideshare import SlideshareIE
 from .slutload import SlutloadIE
 from .smotri import (


@@ -565,15 +601,12 @@ 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,
     SoundcloudUserIE,
 from .soundcloud import (
     SoundcloudIE,
     SoundcloudSetIE,
     SoundcloudUserIE,

-    SoundcloudPlaylistIE
+    SoundcloudPlaylistIE,
+    SoundcloudSearchIE

 )
 from .soundgasm import (
     SoundgasmIE,
 )
 from .soundgasm import (
     SoundgasmIE,


@@ -626,6 +659,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 .tele13 import Tele13IE

 from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE
 from .telegraaf import TelegraafIE
 from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE
 from .telegraaf import TelegraafIE


@@ -635,6 +669,7 @@ from .tenplay import TenPlayIE
 from .testurl import TestURLIE
 from .testtube import TestTubeIE
 from .tf1 import TF1IE
 from .testurl import TestURLIE
 from .testtube import TestTubeIE
 from .tf1 import TF1IE

+from .theintercept import TheInterceptIE

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


@@ -654,6 +689,7 @@ from .tnaflix import (
     EMPFlixIE,
     MovieFapIE,
 )
     EMPFlixIE,
     MovieFapIE,
 )

+from .toggle import ToggleIE

 from .thvideo import (
     THVideoIE,
     THVideoPlaylistIE
 from .thvideo import (
     THVideoIE,
     THVideoPlaylistIE


@@ -728,9 +764,7 @@ from .videofyme import VideofyMeIE
 from .videomega import VideoMegaIE
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE
 from .videomega import VideoMegaIE
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE

-from .videoweed import VideoWeedIE

 from .vidme import VidmeIE
 from .vidme import VidmeIE

-from .vidto import VidtoIE

 from .vidzi import VidziIE
 from .vier import VierIE, VierVideosIE
 from .viewster import ViewsterIE
 from .vidzi import VidziIE
 from .vier import VierIE, VierVideosIE
 from .viewster import ViewsterIE


@@ -787,6 +821,7 @@ from .wrzuta import WrzutaIE
 from .wsj import WSJIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .wsj import WSJIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE

+from .xfileshare import XFileShareIE

 from .xhamster import (
     XHamsterIE,
     XHamsterEmbedIE,
 from .xhamster import (
     XHamsterIE,
     XHamsterEmbedIE,


@@ -830,6 +865,7 @@ from .youtube import (
     YoutubeTruncatedIDIE,
     YoutubeTruncatedURLIE,
     YoutubeUserIE,
     YoutubeTruncatedIDIE,
     YoutubeTruncatedURLIE,
     YoutubeUserIE,

+    YoutubePlaylistsIE,

     YoutubeWatchLaterIE,
 )
 from .zapiks import ZapiksIE
     YoutubeWatchLaterIE,
 )
 from .zapiks import ZapiksIE