release 2016.06.18.1

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

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index f9fed18f620bd92ba042d4e1726abe188b51e2ef..efa58f70fb6f8e3db0d811f4230e609243c174cf 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -21,6 +21,7 @@ from .adobetv import (
 )
 from .adultswim import AdultSwimIE
 from .aenetworks import AENetworksIE
 )
 from .adultswim import AdultSwimIE
 from .aenetworks import AENetworksIE

+from .afreecatv import AfreecaTVIE

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


@@ -56,6 +57,7 @@ from .arte import (
     ArteTVDDCIE,
     ArteTVMagazineIE,
     ArteTVEmbedIE,
     ArteTVDDCIE,
     ArteTVMagazineIE,
     ArteTVEmbedIE,

+    ArteTVPlaylistIE,

 )
 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE
 )
 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE


@@ -69,6 +71,8 @@ from .bandcamp import BandcampIE, BandcampAlbumIE
 from .bbc import (
     BBCCoUkIE,
     BBCCoUkArticleIE,
 from .bbc import (
     BBCCoUkIE,
     BBCCoUkArticleIE,

+    BBCCoUkIPlayerPlaylistIE,
+    BBCCoUkPlaylistIE,

     BBCIE,
 )
 from .beeg import BeegIE
     BBCIE,
 )
 from .beeg import BeegIE


@@ -106,6 +110,10 @@ from .camwithher import CamWithHerIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .canvas import CanvasIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .canvas import CanvasIE

+from .carambatv import (
+    CarambaTVIE,
+    CarambaTVPageIE,
+)

 from .cbc import (
     CBCIE,
     CBCPlayerIE,
 from .cbc import (
     CBCIE,
     CBCPlayerIE,


@@ -143,6 +151,7 @@ from .cnn import (
     CNNBlogsIE,
     CNNArticleIE,
 )
     CNNBlogsIE,
     CNNArticleIE,
 )

+from .coub import CoubIE

 from .collegerama import CollegeRamaIE
 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
 from .comcarcoff import ComCarCoffIE
 from .collegerama import CollegeRamaIE
 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
 from .comcarcoff import ComCarCoffIE


@@ -231,6 +240,7 @@ from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE
 from .expotv import ExpoTVIE
 from .extremetube import ExtremeTubeIE
 from .exfm import ExfmIE
 from .expotv import ExpoTVIE
 from .extremetube import ExtremeTubeIE

+from .eyedotv import EyedoTVIE

 from .facebook import FacebookIE
 from .faz import FazIE
 from .fc2 import FC2IE
 from .facebook import FacebookIE
 from .faz import FazIE
 from .fc2 import FC2IE


@@ -288,6 +298,7 @@ from .globo import (
     GloboArticleIE,
 )
 from .godtube import GodTubeIE
     GloboArticleIE,
 )
 from .godtube import GodTubeIE

+from .godtv import GodTVIE

 from .goldenmoustache import GoldenMoustacheIE
 from .golem import GolemIE
 from .googledrive import GoogleDriveIE
 from .goldenmoustache import GoldenMoustacheIE
 from .golem import GolemIE
 from .googledrive import GoogleDriveIE


@@ -379,6 +390,7 @@ from .leeco import (
     LePlaylistIE,
     LetvCloudIE,
 )
     LePlaylistIE,
     LetvCloudIE,
 )

+from .libraryofcongress import LibraryOfCongressIE

 from .libsyn import LibsynIE
 from .lifenews import (
     LifeNewsIE,
 from .libsyn import LibsynIE
 from .lifenews import (
     LifeNewsIE,


@@ -506,7 +518,10 @@ from .nhl import (
     NHLVideocenterCategoryIE,
     NHLIE,
 )
     NHLVideocenterCategoryIE,
     NHLIE,
 )

-from .nick import NickIE
+from .nick import (
+    NickIE,
+    NickDeIE,
+)

 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninegag import NineGagIE
 from .noco import NocoIE
 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninegag import NineGagIE
 from .noco import NocoIE


@@ -636,10 +651,14 @@ from .regiotv import RegioTVIE
 from .restudy import RestudyIE
 from .reuters import ReutersIE
 from .reverbnation import ReverbNationIE
 from .restudy import RestudyIE
 from .reuters import ReutersIE
 from .reverbnation import ReverbNationIE

-from .revision3 import Revision3IE
+from .revision3 import (
+    Revision3EmbedIE,
+    Revision3IE,
+)

 from .rice import RICEIE
 from .ringtv import RingTVIE
 from .ro220 import Ro220IE
 from .rice import RICEIE
 from .ringtv import RingTVIE
 from .ro220 import Ro220IE

+from .rockstargames import RockstarGamesIE

 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtbf import RTBFIE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtbf import RTBFIE


@@ -675,6 +694,7 @@ from .screencast import ScreencastIE
 from .screencastomatic import ScreencastOMaticIE
 from .screenjunkies import ScreenJunkiesIE
 from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE
 from .screencastomatic import ScreencastOMaticIE
 from .screenjunkies import ScreenJunkiesIE
 from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE

+from .seeker import SeekerIE

 from .senateisvp import SenateISVPIE
 from .sendtonews import SendtoNewsIE
 from .servingsys import ServingSysIE
 from .senateisvp import SenateISVPIE
 from .sendtonews import SendtoNewsIE
 from .servingsys import ServingSysIE


@@ -767,6 +787,7 @@ from .telecinco import TelecincoIE
 from .telegraaf import TelegraafIE
 from .telemb import TeleMBIE
 from .teletask import TeleTaskIE
 from .telegraaf import TelegraafIE
 from .telemb import TeleMBIE
 from .teletask import TeleTaskIE

+from .telewebion import TelewebionIE

 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .theintercept import TheInterceptIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .theintercept import TheInterceptIE


@@ -832,7 +853,10 @@ from .tvc import (
 )
 from .tvigle import TvigleIE
 from .tvland import TVLandIE
 )
 from .tvigle import TvigleIE
 from .tvland import TVLandIE

-from .tvp import TvpIE, TvpSeriesIE
+from .tvp import (
+    TVPIE,
+    TVPSeriesIE,
+)

 from .tvplay import TVPlayIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE
 from .tvplay import TVPlayIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE


@@ -848,6 +872,7 @@ from .twitch import (
     TwitchProfileIE,
     TwitchPastBroadcastsIE,
     TwitchStreamIE,
     TwitchProfileIE,
     TwitchPastBroadcastsIE,
     TwitchStreamIE,

+    TwitchClipsIE,

 )
 from .twitter import (
     TwitterCardIE,
 )
 from .twitter import (
     TwitterCardIE,


@@ -899,6 +924,7 @@ from .videomore import (
 )
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE
 )
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE

+from .vidio import VidioIE

 from .vidme import (
     VidmeIE,
     VidmeUserIE,
 from .vidme import (
     VidmeIE,
     VidmeUserIE,


@@ -944,7 +970,6 @@ from .vporn import VpornIE
 from .vrt import VRTIE
 from .vube import VubeIE
 from .vuclip import VuClipIE
 from .vrt import VRTIE
 from .vube import VubeIE
 from .vuclip import VuClipIE

-from .vulture import VultureIE

 from .walla import WallaIE
 from .washingtonpost import (
     WashingtonPostIE,
 from .walla import WallaIE
 from .washingtonpost import (
     WashingtonPostIE,


@@ -955,18 +980,19 @@ from .watchindianporn import WatchIndianPornIE
 from .wdr import (
     WDRIE,
     WDRMobileIE,
 from .wdr import (
     WDRIE,
     WDRMobileIE,

-    WDRMausIE,

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

-from .weibo import WeiboIE

 from .weiqitv import WeiqiTVIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .weiqitv import WeiqiTVIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE

-from .wrzuta import WrzutaIE
+from .wrzuta import (
+    WrzutaIE,
+    WrzutaPlaylistIE,
+)

 from .wsj import WSJIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .wsj import WSJIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE


@@ -1002,7 +1028,10 @@ from .yesjapan import YesJapanIE
 from .yinyuetai import YinYueTaiIE
 from .ynet import YnetIE
 from .youjizz import YouJizzIE
 from .yinyuetai import YinYueTaiIE
 from .ynet import YnetIE
 from .youjizz import YouJizzIE

-from .youku import YoukuIE
+from .youku import (
+    YoukuIE,
+    YoukuShowIE,
+)

 from .youporn import YouPornIE
 from .yourupload import YourUploadIE
 from .youtube import (
 from .youporn import YouPornIE
 from .yourupload import YourUploadIE
 from .youtube import (