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

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 631381eeafcca00685f56675f72bafdd997afd87..eb8ef1fe3eb8720a677b22d4d249c26de09b303a 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -4,7 +4,10 @@ from .abc import ABCIE
 from .abc7news import Abc7NewsIE
 from .academicearth import AcademicEarthCourseIE
 from .addanime import AddAnimeIE
 from .abc7news import Abc7NewsIE
 from .academicearth import AcademicEarthCourseIE
 from .addanime import AddAnimeIE

-from .adobetv import AdobeTVIE
+from .adobetv import (
+    AdobeTVIE,
+    AdobeTVVideoIE,
+)

 from .adultswim import AdultSwimIE
 from .aftenposten import AftenpostenIE
 from .aftonbladet import AftonbladetIE
 from .adultswim import AdultSwimIE
 from .aftenposten import AftenpostenIE
 from .aftonbladet import AftonbladetIE


@@ -16,9 +19,14 @@ from .anysex import AnySexIE
 from .aol import AolIE
 from .allocine import AllocineIE
 from .aparat import AparatIE
 from .aol import AolIE
 from .allocine import AllocineIE
 from .aparat import AparatIE

+from .appleconnect import AppleConnectIE

 from .appletrailers import AppleTrailersIE
 from .archiveorg import ArchiveOrgIE
 from .appletrailers import AppleTrailersIE
 from .archiveorg import ArchiveOrgIE

-from .ard import ARDIE, ARDMediathekIE
+from .ard import (
+    ARDIE,
+    ARDMediathekIE,
+    SportschauIE,
+)

 from .arte import (
     ArteTvIE,
     ArteTVPlus7IE,
 from .arte import (
     ArteTvIE,
     ArteTVPlus7IE,


@@ -35,7 +43,10 @@ from .azubu import AzubuIE
 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE

-from .bbccouk import BBCCoUkIE
+from .bbc import (
+    BBCCoUkIE,
+    BBCIE,
+)

 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .beatportpro import BeatportProIE
 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .beatportpro import BeatportProIE


@@ -103,15 +114,21 @@ from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,
     DailymotionUserIE,
     DailymotionIE,
     DailymotionPlaylistIE,
     DailymotionUserIE,

+    DailymotionCloudIE,

 )
 from .daum import DaumIE
 from .dbtv import DBTVIE
 )
 from .daum import DaumIE
 from .dbtv import DBTVIE

+from .dcn import DcnIE

 from .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE
 from .dfb import DFBIE
 from .dhm import DHMIE
 from .dotsub import DotsubIE
 from .douyutv import DouyuTVIE
 from .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE
 from .dfb import DFBIE
 from .dhm import DHMIE
 from .dotsub import DotsubIE
 from .douyutv import DouyuTVIE

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

 from .dreisat import DreiSatIE
 from .drbonanza import DRBonanzaIE
 from .drtuber import DrTuberIE
 from .dreisat import DreiSatIE
 from .drbonanza import DRBonanzaIE
 from .drtuber import DrTuberIE


@@ -136,7 +153,6 @@ from .ellentv import (
 )
 from .elpais import ElPaisIE
 from .embedly import EmbedlyIE
 )
 from .elpais import ElPaisIE
 from .embedly import EmbedlyIE

-from .empflix import EMPFlixIE

 from .engadget import EngadgetIE
 from .eporner import EpornerIE
 from .eroprofile import EroProfileIE
 from .engadget import EngadgetIE
 from .eporner import EpornerIE
 from .eroprofile import EroProfileIE


@@ -152,6 +168,7 @@ from .fc2 import FC2IE
 from .firstpost import FirstpostIE
 from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE
 from .firstpost import FirstpostIE
 from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE

+from .fivetv import FiveTVIE

 from .fktv import (
     FKTVIE,
     FKTVPosteckeIE,
 from .fktv import (
     FKTVIE,
     FKTVPosteckeIE,


@@ -229,6 +246,8 @@ from .infoq import InfoQIE
 from .instagram import InstagramIE, InstagramUserIE
 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE
 from .instagram import InstagramIE, InstagramUserIE
 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE

+from .iqiyi import IqiyiIE
+from .ir90tv import Ir90TvIE

 from .ivi import (
     IviIE,
     IviCompilationIE
 from .ivi import (
     IviIE,
     IviCompilationIE


@@ -251,8 +270,17 @@ from .keek import KeekIE
 from .kontrtube import KontrTubeIE
 from .krasview import KrasViewIE
 from .ku6 import Ku6IE
 from .kontrtube import KontrTubeIE
 from .krasview import KrasViewIE
 from .ku6 import Ku6IE

+from .kuwo import (
+    KuwoIE,
+    KuwoAlbumIE,
+    KuwoChartIE,
+    KuwoSingerIE,
+    KuwoCategoryIE,
+    KuwoMvIE,
+)

 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE
 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE

+from .lecture2go import Lecture2GoIE

 from .letv import (
     LetvIE,
     LetvTvIE,
 from .letv import (
     LetvIE,
     LetvTvIE,


@@ -314,6 +342,7 @@ from .musicvault import MusicVaultIE
 from .muzu import MuzuTVIE
 from .myspace import MySpaceIE, MySpaceAlbumIE
 from .myspass import MySpassIE
 from .muzu import MuzuTVIE
 from .myspace import MySpaceIE, MySpaceAlbumIE
 from .myspass import MySpassIE

+from .myvi import MyviIE

 from .myvideo import MyVideoIE
 from .myvidster import MyVidsterIE
 from .nationalgeographic import NationalGeographicIE
 from .myvideo import MyVideoIE
 from .myvidster import MyVidsterIE
 from .nationalgeographic import NationalGeographicIE


@@ -333,6 +362,15 @@ from .ndtv import NDTVIE
 from .netzkino import NetzkinoIE
 from .nerdcubed import NerdCubedFeedIE
 from .nerdist import NerdistIE
 from .netzkino import NetzkinoIE
 from .nerdcubed import NerdCubedFeedIE
 from .nerdist import NerdistIE

+from .neteasemusic import (
+    NetEaseMusicIE,
+    NetEaseMusicAlbumIE,
+    NetEaseMusicSingerIE,
+    NetEaseMusicListIE,
+    NetEaseMusicMvIE,
+    NetEaseMusicProgramIE,
+    NetEaseMusicDjRadioIE,
+)

 from .newgrounds import NewgroundsIE
 from .newstube import NewstubeIE
 from .nextmedia import (
 from .newgrounds import NewgroundsIE
 from .newstube import NewstubeIE
 from .nextmedia import (


@@ -362,7 +400,8 @@ from .npo import (
     NPOLiveIE,
     NPORadioIE,
     NPORadioFragmentIE,
     NPOLiveIE,
     NPORadioIE,
     NPORadioFragmentIE,

-    TegenlichtVproIE,
+    VPROIE,
+    WNLIE

 )
 from .nrk import (
     NRKIE,
 )
 from .nrk import (
     NRKIE,


@@ -378,6 +417,7 @@ from .nytimes import (
 from .nuvid import NuvidIE
 from .odnoklassniki import OdnoklassnikiIE
 from .oktoberfesttv import OktoberfestTVIE
 from .nuvid import NuvidIE
 from .odnoklassniki import OdnoklassnikiIE
 from .oktoberfesttv import OktoberfestTVIE

+from .onionstudios import OnionStudiosIE

 from .ooyala import (
     OoyalaIE,
     OoyalaExternalIE,
 from .ooyala import (
     OoyalaIE,
     OoyalaExternalIE,


@@ -395,6 +435,7 @@ from .pbs import PBSIE
 from .philharmoniedeparis import PhilharmonieDeParisIE
 from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE
 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 .planetaplay import PlanetaPlayIE
 from .pladform import PladformIE
 from .played import PlayedIE


@@ -421,6 +462,7 @@ from .qqmusic import (
     QQMusicSingerIE,
     QQMusicAlbumIE,
     QQMusicToplistIE,
     QQMusicSingerIE,
     QQMusicAlbumIE,
     QQMusicToplistIE,

+    QQMusicPlaylistIE,

 )
 from .quickvid import QuickVidIE
 from .r7 import R7IE
 )
 from .quickvid import QuickVidIE
 from .r7 import R7IE


@@ -430,6 +472,7 @@ from .radiobremen import RadioBremenIE
 from .radiofrance import RadioFranceIE
 from .rai import RaiIE
 from .rbmaradio import RBMARadioIE
 from .radiofrance import RadioFranceIE
 from .rai import RaiIE
 from .rbmaradio import RBMARadioIE

+from .rds import RDSIE

 from .redtube import RedTubeIE
 from .restudy import RestudyIE
 from .reverbnation import ReverbNationIE
 from .redtube import RedTubeIE
 from .restudy import RestudyIE
 from .reverbnation import ReverbNationIE


@@ -481,6 +524,10 @@ from .smotri import (
     SmotriUserIE,
     SmotriBroadcastIE,
 )
     SmotriUserIE,
     SmotriBroadcastIE,
 )

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

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


@@ -554,6 +601,7 @@ from .tf1 import TF1IE
 from .theonion import TheOnionIE
 from .theplatform import ThePlatformIE
 from .thesixtyone import TheSixtyOneIE
 from .theonion import TheOnionIE
 from .theplatform import ThePlatformIE
 from .thesixtyone import TheSixtyOneIE

+from .thisamericanlife import ThisAmericanLifeIE

 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE
 from .tlc import TlcIE, TlcDeIE
 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE
 from .tlc import TlcIE, TlcDeIE


@@ -561,7 +609,11 @@ from .tmz import (
     TMZIE,
     TMZArticleIE,
 )
     TMZIE,
     TMZArticleIE,
 )

-from .tnaflix import TNAFlixIE
+from .tnaflix import (
+    TNAFlixIE,
+    EMPFlixIE,
+    MovieFapIE,
+)

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


@@ -583,6 +635,10 @@ from .tv2 import (
     TV2ArticleIE,
 )
 from .tv4 import TV4IE
     TV2ArticleIE,
 )
 from .tv4 import TV4IE

+from .tvc import (
+    TVCIE,
+    TVCArticleIE,
+)

 from .tvigle import TvigleIE
 from .tvp import TvpIE, TvpSeriesIE
 from .tvplay import TVPlayIE
 from .tvigle import TvigleIE
 from .tvp import TvpIE, TvpSeriesIE
 from .tvplay import TVPlayIE


@@ -601,6 +657,7 @@ from .twitch import (
     TwitchBookmarksIE,
     TwitchStreamIE,
 )
     TwitchBookmarksIE,
     TwitchStreamIE,
 )

+from .twitter import TwitterCardIE

 from .ubu import UbuIE
 from .udemy import (
     UdemyIE,
 from .ubu import UbuIE
 from .udemy import (
     UdemyIE,


@@ -677,7 +734,10 @@ from .wdr import (
     WDRMobileIE,
     WDRMausIE,
 )
     WDRMobileIE,
     WDRMausIE,
 )

-from .webofstories import WebOfStoriesIE
+from .webofstories import (
+    WebOfStoriesIE,
+    WebOfStoriesPlaylistIE,
+)

 from .weibo import WeiboIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .weibo import WeiboIE
 from .wimp import WimpIE
 from .wistia import WistiaIE


@@ -686,7 +746,10 @@ 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 .xhamster import XHamsterIE
+from .xhamster import (
+    XHamsterIE,
+    XHamsterEmbedIE,
+)

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


@@ -705,6 +768,7 @@ from .yandexmusic import (
     YandexMusicPlaylistIE,
 )
 from .yesjapan import YesJapanIE
     YandexMusicPlaylistIE,
 )
 from .yesjapan import YesJapanIE

+from .yinyuetai import YinYueTaiIE

 from .ynet import YnetIE
 from .youjizz import YouJizzIE
 from .youku import YoukuIE
 from .ynet import YnetIE
 from .youjizz import YouJizzIE
 from .youku import YoukuIE