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 a0e3b333d595e5d73a09f91240a7413c7dabae03..eb8ef1fe3eb8720a677b22d4d249c26de09b303a 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -19,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,


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


@@ -110,6 +118,7 @@ from .dailymotion import (
 )
 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 .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE
 from .dfb import DFBIE


@@ -238,6 +247,7 @@ from .instagram import InstagramIE, InstagramUserIE
 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE
 from .iqiyi import IqiyiIE
 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


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


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


@@ -342,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 (


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

-    TegenlichtVproIE,
+    VPROIE,
+    WNLIE

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


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


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