release 2017.10.15

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

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 7484099f6e492e6a3bcf06862b3a0337c0ee7cd9..ecb33bc9e7dbbb673a87fc93036e75d06c6f6229 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -31,19 +31,19 @@ from .aenetworks import (
     AENetworksIE,
     HistoryTopicIE,
 )
     AENetworksIE,
     HistoryTopicIE,
 )

-from .afreecatv import (
-    AfreecaTVIE,
-    AfreecaTVGlobalIE,
-)
+from .afreecatv import AfreecaTVIE

 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE
 from .alphaporno import AlphaPornoIE
 from .amcnetworks import AMCNetworksIE
 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE
 from .alphaporno import AlphaPornoIE
 from .amcnetworks import AMCNetworksIE

+from .americastestkitchen import AmericasTestKitchenIE

 from .animeondemand import AnimeOnDemandIE
 from .anitube import AnitubeIE
 from .animeondemand import AnimeOnDemandIE
 from .anitube import AnitubeIE

+from .anvato import AnvatoIE

 from .anysex import AnySexIE
 from .aol import AolIE
 from .allocine import AllocineIE
 from .anysex import AnySexIE
 from .aol import AolIE
 from .allocine import AllocineIE

+from .aliexpress import AliExpressLiveIE

 from .aparat import AparatIE
 from .appleconnect import AppleConnectIE
 from .appletrailers import (
 from .aparat import AparatIE
 from .appleconnect import AppleConnectIE
 from .appletrailers import (


@@ -70,6 +70,10 @@ from .arte import (
     TheOperaPlatformIE,
     ArteTVPlaylistIE,
 )
     TheOperaPlatformIE,
     ArteTVPlaylistIE,
 )

+from .asiancrush import (
+    AsianCrushIE,
+    AsianCrushPlaylistIE,
+)

 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE
 from .atvat import ATVAtIE
 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE
 from .atvat import ATVAtIE


@@ -87,10 +91,9 @@ from .azmedien import (
     AZMedienPlaylistIE,
     AZMedienShowPlaylistIE,
 )
     AZMedienPlaylistIE,
     AZMedienShowPlaylistIE,
 )

-from .azubu import AzubuIE, AzubuLiveIE

 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE

-from .bandcamp import BandcampIE, BandcampAlbumIE
+from .bandcamp import BandcampIE, BandcampAlbumIE, BandcampWeeklyIE

 from .bbc import (
     BBCCoUkIE,
     BBCCoUkArticleIE,
 from .bbc import (
     BBCCoUkIE,
     BBCCoUkArticleIE,


@@ -98,7 +101,10 @@ from .bbc import (
     BBCCoUkPlaylistIE,
     BBCIE,
 )
     BBCCoUkPlaylistIE,
     BBCIE,
 )

-from .beampro import BeamProLiveIE
+from .beampro import (
+    BeamProLiveIE,
+    BeamProVodIE,
+)

 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .bellmedia import BellMediaIE
 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .bellmedia import BellMediaIE


@@ -141,7 +147,10 @@ from .camdemy import (
 from .camwithher import CamWithHerIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .camwithher import CamWithHerIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE

-from .canvas import CanvasIE
+from .canvas import (
+    CanvasIE,
+    CanvasEenIE,
+)

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


@@ -178,8 +187,9 @@ from .chirbit import (
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE

-from .clipfish import ClipfishIE
+from .cjsw import CJSWIE

 from .cliphunter import CliphunterIE
 from .cliphunter import CliphunterIE

+from .clippit import ClippitIE

 from .cliprs import ClipRsIE
 from .clipsyndicate import ClipsyndicateIE
 from .closertotruth import CloserToTruthIE
 from .cliprs import ClipRsIE
 from .clipsyndicate import ClipsyndicateIE
 from .closertotruth import CloserToTruthIE


@@ -251,7 +261,10 @@ from .democracynow import DemocracynowIE
 from .dfb import DFBIE
 from .dhm import DHMIE
 from .dotsub import DotsubIE
 from .dfb import DFBIE
 from .dhm import DHMIE
 from .dotsub import DotsubIE

-from .douyutv import DouyuTVIE
+from .douyutv import (
+    DouyuShowIE,
+    DouyuTVIE,
+)

 from .dplay import (
     DPlayIE,
     DPlayItIE,
 from .dplay import (
     DPlayIE,
     DPlayItIE,


@@ -287,7 +300,10 @@ from .dw import (
 from .eagleplatform import EaglePlatformIE
 from .ebaumsworld import EbaumsWorldIE
 from .echomsk import EchoMskIE
 from .eagleplatform import EaglePlatformIE
 from .ebaumsworld import EbaumsWorldIE
 from .echomsk import EchoMskIE

-from .egghead import EggheadCourseIE
+from .egghead import (
+    EggheadCourseIE,
+    EggheadLessonIE,
+)

 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .einthusan import EinthusanIE
 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .einthusan import EinthusanIE


@@ -337,7 +353,12 @@ from .flipagram import FlipagramIE
 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .formula1 import Formula1IE
 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .formula1 import Formula1IE

-from .fourtube import FourTubeIE
+from .fourtube import (
+    FourTubeIE,
+    PornTubeIE,
+    PornerBrosIE,
+    FuxIE,
+)

 from .fox import FOXIE
 from .fox9 import FOX9IE
 from .foxgay import FoxgayIE
 from .fox import FOXIE
 from .fox9 import FOX9IE
 from .foxgay import FoxgayIE


@@ -350,9 +371,9 @@ from .foxsports import FoxSportsIE
 from .franceculture import FranceCultureIE
 from .franceinter import FranceInterIE
 from .francetv import (
 from .franceculture import FranceCultureIE
 from .franceinter import FranceInterIE
 from .francetv import (

-    PluzzIE,
-    FranceTvInfoIE,

     FranceTVIE,
     FranceTVIE,

+    FranceTVEmbedIE,
+    FranceTVInfoIE,

     GenerationQuoiIE,
     CultureboxIE,
 )
     GenerationQuoiIE,
     CultureboxIE,
 )


@@ -360,6 +381,7 @@ from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 from .freshlive import FreshLiveIE
 from .funimation import FunimationIE
 from .freespeech import FreespeechIE
 from .freshlive import FreshLiveIE
 from .funimation import FunimationIE

+from .funk import FunkIE

 from .funnyordie import FunnyOrDieIE
 from .fusion import FusionIE
 from .fxnetworks import FXNetworksIE
 from .funnyordie import FunnyOrDieIE
 from .fusion import FusionIE
 from .fxnetworks import FXNetworksIE


@@ -384,8 +406,8 @@ from .globo import (
     GloboArticleIE,
 )
 from .go import GoIE
     GloboArticleIE,
 )
 from .go import GoIE

+from .go90 import Go90IE

 from .godtube import GodTubeIE
 from .godtube import GodTubeIE

-from .godtv import GodTVIE

 from .golem import GolemIE
 from .googledrive import GoogleDriveIE
 from .googleplus import GooglePlusIE
 from .golem import GolemIE
 from .googledrive import GoogleDriveIE
 from .googleplus import GooglePlusIE


@@ -459,8 +481,10 @@ from .jamendo import (
 )
 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE
 )
 from .jeuxvideo import JeuxVideoIE
 from .jove import JoveIE

+from .joj import JojIE

 from .jwplatform import JWPlatformIE
 from .jpopsukitv import JpopsukiIE
 from .jwplatform import JWPlatformIE
 from .jpopsukitv import JpopsukiIE

+from .kakao import KakaoIE

 from .kaltura import KalturaIE
 from .kamcord import KamcordIE
 from .kanalplay import KanalPlayIE
 from .kaltura import KalturaIE
 from .kamcord import KamcordIE
 from .kanalplay import KanalPlayIE


@@ -489,6 +513,7 @@ from .la7 import LA7IE
 from .laola1tv import (
     Laola1TvEmbedIE,
     Laola1TvIE,
 from .laola1tv import (
     Laola1TvEmbedIE,
     Laola1TvIE,

+    ITTFIE,

 )
 from .lci import LCIIE
 from .lcp import (
 )
 from .lci import LCIIE
 from .lcp import (


@@ -516,7 +541,10 @@ from .limelight import (
     LimelightChannelListIE,
 )
 from .litv import LiTVIE
     LimelightChannelListIE,
 )
 from .litv import LiTVIE

-from .liveleak import LiveLeakIE
+from .liveleak import (
+    LiveLeakIE,
+    LiveLeakEmbedIE,
+)

 from .livestream import (
     LivestreamIE,
     LivestreamOriginalIE,
 from .livestream import (
     LivestreamIE,
     LivestreamOriginalIE,


@@ -539,9 +567,12 @@ from .mangomolo import (
     MangomoloVideoIE,
     MangomoloLiveIE,
 )
     MangomoloVideoIE,
     MangomoloLiveIE,
 )

+from .manyvids import ManyVidsIE

 from .matchtv import MatchTVIE
 from .mdr import MDRIE
 from .matchtv import MatchTVIE
 from .mdr import MDRIE

+from .mediaset import MediasetIE

 from .medici import MediciIE
 from .medici import MediciIE

+from .megaphone import MegaphoneIE

 from .meipai import MeipaiIE
 from .melonvod import MelonVODIE
 from .meta import METAIE
 from .meipai import MeipaiIE
 from .melonvod import MelonVODIE
 from .meta import METAIE


@@ -568,7 +599,6 @@ from .mixcloud import (
 )
 from .mlb import MLBIE
 from .mnet import MnetIE
 )
 from .mlb import MLBIE
 from .mnet import MnetIE

-from .mpora import MporaIE

 from .moevideo import MoeVideoIE
 from .mofosex import MofosexIE
 from .mojvideo import MojvideoIE
 from .moevideo import MoeVideoIE
 from .mofosex import MofosexIE
 from .mojvideo import MojvideoIE


@@ -629,7 +659,10 @@ from .neteasemusic import (
     NetEaseMusicProgramIE,
     NetEaseMusicDjRadioIE,
 )
     NetEaseMusicProgramIE,
     NetEaseMusicDjRadioIE,
 )

-from .newgrounds import NewgroundsIE
+from .newgrounds import (
+    NewgroundsIE,
+    NewgroundsPlaylistIE,
+)

 from .newstube import NewstubeIE
 from .nextmedia import (
     NextMediaIE,
 from .newstube import NewstubeIE
 from .nextmedia import (
     NextMediaIE,


@@ -637,6 +670,10 @@ from .nextmedia import (
     AppleDailyIE,
     NextTVIE,
 )
     AppleDailyIE,
     NextTVIE,
 )

+from .nexx import (
+    NexxIE,
+    NexxEmbedIE,
+)

 from .nfb import NFBIE
 from .nfl import NFLIE
 from .nhk import NhkVodIE
 from .nfb import NFBIE
 from .nfl import NFLIE
 from .nhk import NhkVodIE


@@ -650,6 +687,7 @@ from .nick import (
     NickIE,
     NickDeIE,
     NickNightIE,
     NickIE,
     NickDeIE,
     NickNightIE,

+    NickRuIE,

 )
 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninecninemedia import (
 )
 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninecninemedia import (


@@ -662,6 +700,8 @@ from .nintendo import NintendoIE
 from .njpwworld import NJPWWorldIE
 from .nobelprize import NobelPrizeIE
 from .noco import NocoIE
 from .njpwworld import NJPWWorldIE
 from .nobelprize import NobelPrizeIE
 from .noco import NocoIE

+from .nonktube import NonkTubeIE
+from .noovo import NoovoIE

 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE
 from .nova import NovaIE
 from .normalboots import NormalbootsIE
 from .nosvideo import NosVideoIE
 from .nova import NovaIE


@@ -730,8 +770,9 @@ from .openload import OpenloadIE
 from .ora import OraTVIE
 from .orf import (
     ORFTVthekIE,
 from .ora import OraTVIE
 from .orf import (
     ORFTVthekIE,

-    ORFOE1IE,

     ORFFM4IE,
     ORFFM4IE,

+    ORFFM4StoryIE,
+    ORFOE1IE,

     ORFIPTVIE,
 )
 from .packtpub import (
     ORFIPTVIE,
 )
 from .packtpub import (


@@ -743,6 +784,7 @@ 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 .pearvideo import PearVideoIE

 from .people import PeopleIE
 from .periscope import (
     PeriscopeIE,
 from .people import PeopleIE
 from .periscope import (
     PeriscopeIE,


@@ -769,6 +811,7 @@ from .polskieradio import (
     PolskieRadioIE,
     PolskieRadioCategoryIE,
 )
     PolskieRadioIE,
     PolskieRadioCategoryIE,
 )

+from .popcorntv import PopcornTVIE

 from .porn91 import Porn91IE
 from .porncom import PornComIE
 from .pornflip import PornFlipIE
 from .porn91 import Porn91IE
 from .porncom import PornComIE
 from .pornflip import PornFlipIE


@@ -808,11 +851,16 @@ from .radiobremen import RadioBremenIE
 from .radiofrance import RadioFranceIE
 from .rai import (
     RaiPlayIE,
 from .radiofrance import RadioFranceIE
 from .rai import (
     RaiPlayIE,

+    RaiPlayLiveIE,

     RaiIE,
 )
 from .rbmaradio import RBMARadioIE
 from .rds import RDSIE
 from .redbulltv import RedBullTVIE
     RaiIE,
 )
 from .rbmaradio import RBMARadioIE
 from .rds import RDSIE
 from .redbulltv import RedBullTVIE

+from .reddit import (
+    RedditIE,
+    RedditRIE,
+)

 from .redtube import RedTubeIE
 from .regiotv import RegioTVIE
 from .rentv import (
 from .redtube import RedTubeIE
 from .regiotv import RegioTVIE
 from .rentv import (


@@ -856,9 +904,11 @@ from .rutube import (
     RutubeEmbedIE,
     RutubeMovieIE,
     RutubePersonIE,
     RutubeEmbedIE,
     RutubeMovieIE,
     RutubePersonIE,

+    RutubePlaylistIE,

 )
 from .rutv import RUTVIE
 from .ruutu import RuutuIE
 )
 from .rutv import RUTVIE
 from .ruutu import RuutuIE

+from .ruv import RuvIE

 from .sandia import SandiaIE
 from .safari import (
     SafariIE,
 from .sandia import SandiaIE
 from .safari import (
     SafariIE,


@@ -891,6 +941,7 @@ from .skynewsarabia import (
 )
 from .skysports import SkySportsIE
 from .slideshare import SlideshareIE
 )
 from .skysports import SkySportsIE
 from .slideshare import SlideshareIE

+from .slideslive import SlidesLiveIE

 from .slutload import SlutloadIE
 from .smotri import (
     SmotriIE,
 from .slutload import SlutloadIE
 from .smotri import (
     SmotriIE,


@@ -905,8 +956,9 @@ from .soundcloud import (
     SoundcloudIE,
     SoundcloudSetIE,
     SoundcloudUserIE,
     SoundcloudIE,
     SoundcloudSetIE,
     SoundcloudUserIE,

+    SoundcloudTrackStationIE,

     SoundcloudPlaylistIE,
     SoundcloudPlaylistIE,

-    SoundcloudSearchIE
+    SoundcloudSearchIE,

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


@@ -938,6 +990,7 @@ from .srmediathek import SRMediathekIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamable import StreamableIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamable import StreamableIE

+from .streamango import StreamangoIE

 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 from .streetvoice import StreetVoiceIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 from .streetvoice import StreetVoiceIE


@@ -954,6 +1007,7 @@ from .tagesschau import (
     TagesschauIE,
 )
 from .tass import TassIE
     TagesschauIE,
 )
 from .tass import TassIE

+from .tastytrade import TastyTradeIE

 from .tbs import TBSIE
 from .tdslifeway import TDSLifewayIE
 from .teachertube import (
 from .tbs import TBSIE
 from .tdslifeway import TDSLifewayIE
 from .teachertube import (


@@ -962,7 +1016,6 @@ from .teachertube import (
 )
 from .teachingchannel import TeachingChannelIE
 from .teamcoco import TeamcocoIE
 )
 from .teachingchannel import TeachingChannelIE
 from .teamcoco import TeamcocoIE

-from .teamfourstar import TeamFourStarIE

 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .tele13 import Tele13IE
 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .tele13 import Tele13IE


@@ -1011,11 +1064,6 @@ from .trilulilu import TriluliluIE
 from .trutv import TruTVIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE
 from .trutv import TruTVIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE

-from .tudou import (
-    TudouIE,
-    TudouPlaylistIE,
-    TudouAlbumIE,
-)

 from .tumblr import TumblrIE
 from .tunein import (
     TuneInClipIE,
 from .tumblr import TumblrIE
 from .tunein import (
     TuneInClipIE,


@@ -1031,7 +1079,7 @@ from .tv2 import (
     TV2IE,
     TV2ArticleIE,
 )
     TV2IE,
     TV2ArticleIE,
 )

-from .tv2hu import TV2HUIE
+from .tv2hu import TV2HuIE

 from .tv3 import TV3IE
 from .tv4 import TV4IE
 from .tv5mondeplus import TV5MondePlusIE
 from .tv3 import TV3IE
 from .tv4 import TV4IE
 from .tv5mondeplus import TV5MondePlusIE


@@ -1095,6 +1143,10 @@ from .uplynk import (
     UplynkIE,
     UplynkPreplayIE,
 )
     UplynkIE,
     UplynkPreplayIE,
 )

+from .upskill import (
+    UpskillIE,
+    UpskillCourseIE,
+)

 from .urort import UrortIE
 from .urplay import URPlayIE
 from .usanetwork import USANetworkIE
 from .urort import UrortIE
 from .urplay import URPlayIE
 from .usanetwork import USANetworkIE


@@ -1122,6 +1174,7 @@ from .vgtv import (
 from .vh1 import VH1IE
 from .vice import (
     ViceIE,
 from .vh1 import VH1IE
 from .vice import (
     ViceIE,

+    ViceArticleIE,

     ViceShowIE,
 )
 from .viceland import VicelandIE
     ViceShowIE,
 )
 from .viceland import VicelandIE


@@ -1184,13 +1237,18 @@ from .vk import (
 )
 from .vlive import (
     VLiveIE,
 )
 from .vlive import (
     VLiveIE,

-    VLiveChannelIE
+    VLiveChannelIE,
+    VLivePlaylistIE

 )
 from .vodlocker import VodlockerIE
 from .vodpl import VODPlIE
 from .vodplatform import VODPlatformIE
 from .voicerepublic import VoiceRepublicIE
 )
 from .vodlocker import VodlockerIE
 from .vodpl import VODPlIE
 from .vodplatform import VODPlatformIE
 from .voicerepublic import VoiceRepublicIE

-from .voxmedia import VoxMediaIE
+from .voot import VootIE
+from .voxmedia import (
+    VoxMediaVolumeIE,
+    VoxMediaIE,
+)

 from .vporn import VpornIE
 from .vrt import VRTIE
 from .vrak import VrakIE
 from .vporn import VpornIE
 from .vrt import VRTIE
 from .vrak import VrakIE


@@ -1211,6 +1269,7 @@ from .washingtonpost import (
     WashingtonPostArticleIE,
 )
 from .wat import WatIE
     WashingtonPostArticleIE,
 )
 from .wat import WatIE

+from .watchbox import WatchBoxIE

 from .watchindianporn import WatchIndianPornIE
 from .wdr import (
     WDRIE,
 from .watchindianporn import WatchIndianPornIE
 from .wdr import (
     WDRIE,


@@ -1232,7 +1291,10 @@ from .wrzuta import (
     WrzutaIE,
     WrzutaPlaylistIE,
 )
     WrzutaIE,
     WrzutaPlaylistIE,
 )

-from .wsj import WSJIE
+from .wsj import (
+    WSJIE,
+    WSJArticleIE,
+)

 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .xfileshare import XFileShareIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .xfileshare import XFileShareIE


@@ -1257,12 +1319,12 @@ from .yahoo import (
     YahooIE,
     YahooSearchIE,
 )
     YahooIE,
     YahooSearchIE,
 )

-from .yam import YamIE

 from .yandexmusic import (
     YandexMusicTrackIE,
     YandexMusicAlbumIE,
     YandexMusicPlaylistIE,
 )
 from .yandexmusic import (
     YandexMusicTrackIE,
     YandexMusicAlbumIE,
     YandexMusicPlaylistIE,
 )

+from .yandexdisk import YandexDiskIE

 from .yesjapan import YesJapanIE
 from .yinyuetai import YinYueTaiIE
 from .ynet import YnetIE
 from .yesjapan import YesJapanIE
 from .yinyuetai import YinYueTaiIE
 from .ynet import YnetIE


@@ -1285,7 +1347,6 @@ from .youtube import (
     YoutubeSearchDateIE,
     YoutubeSearchIE,
     YoutubeSearchURLIE,
     YoutubeSearchDateIE,
     YoutubeSearchIE,
     YoutubeSearchURLIE,

-    YoutubeSharedVideoIE,

     YoutubeShowIE,
     YoutubeSubscriptionsIE,
     YoutubeTruncatedIDIE,
     YoutubeShowIE,
     YoutubeSubscriptionsIE,
     YoutubeTruncatedIDIE,


@@ -1294,5 +1355,6 @@ from .youtube import (
     YoutubeWatchLaterIE,
 )
 from .zapiks import ZapiksIE
     YoutubeWatchLaterIE,
 )
 from .zapiks import ZapiksIE

+from .zaq1 import Zaq1IE

 from .zdf import ZDFIE, ZDFChannelIE
 from .zingmp3 import ZingMp3IE
 from .zdf import ZDFIE, ZDFChannelIE
 from .zingmp3 import ZingMp3IE