New upstream version 2017.05.18.1

[youtubedl] / youtube_dl / extractor / extractors.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 6a7028a4db9486608bd478e84978b563e0364736..ed603eb29353b76dde46d76a6f9be4ebd9b0b239 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -19,6 +19,7 @@ from .acast import (
     ACastChannelIE,
 )
 from .addanime import AddAnimeIE
     ACastChannelIE,
 )
 from .addanime import AddAnimeIE

+from .adn import ADNIE

 from .adobetv import (
     AdobeTVIE,
     AdobeTVShowIE,
 from .adobetv import (
     AdobeTVIE,
     AdobeTVShowIE,


@@ -40,6 +41,7 @@ from .alphaporno import AlphaPornoIE
 from .amcnetworks import AMCNetworksIE
 from .animeondemand import AnimeOnDemandIE
 from .anitube import AnitubeIE
 from .amcnetworks import AMCNetworksIE
 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


@@ -86,7 +88,6 @@ from .azmedien import (
     AZMedienPlaylistIE,
     AZMedienShowPlaylistIE,
 )
     AZMedienPlaylistIE,
     AZMedienShowPlaylistIE,
 )

-from .azubu import AzubuIE, AzubuLiveIE

 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


@@ -164,7 +165,10 @@ from .ccc import CCCIE
 from .ccma import CCMAIE
 from .cctv import CCTVIE
 from .cda import CDAIE
 from .ccma import CCMAIE
 from .cctv import CCTVIE
 from .cda import CDAIE

-from .ceskatelevize import CeskaTelevizeIE
+from .ceskatelevize import (
+    CeskaTelevizeIE,
+    CeskaTelevizePoradyIE,
+)

 from .channel9 import Channel9IE
 from .charlierose import CharlieRoseIE
 from .chaturbate import ChaturbateIE
 from .channel9 import Channel9IE
 from .charlierose import CharlieRoseIE
 from .chaturbate import ChaturbateIE


@@ -247,7 +251,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,


@@ -272,6 +279,7 @@ from .discoverygo import (
     DiscoveryGoPlaylistIE,
 )
 from .discoverynetworks import DiscoveryNetworksDeIE
     DiscoveryGoPlaylistIE,
 )
 from .discoverynetworks import DiscoveryNetworksDeIE

+from .discoveryvr import DiscoveryVRIE

 from .disney import DisneyIE
 from .dispeak import DigitallySpeakingIE
 from .dropbox import DropboxIE
 from .disney import DisneyIE
 from .dispeak import DigitallySpeakingIE
 from .dropbox import DropboxIE


@@ -345,9 +353,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,
 )


@@ -379,6 +387,7 @@ from .globo import (
     GloboArticleIE,
 )
 from .go import GoIE
     GloboArticleIE,
 )
 from .go import GoIE

+from .go90 import Go90IE

 from .godtube import GodTubeIE
 from .godtv import GodTVIE
 from .golem import GolemIE
 from .godtube import GodTubeIE
 from .godtv import GodTVIE
 from .golem import GolemIE


@@ -536,6 +545,8 @@ from .mangomolo import (
 )
 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 .meipai import MeipaiIE
 from .melonvod import MelonVODIE
 from .meta import METAIE
 from .meipai import MeipaiIE
 from .melonvod import MelonVODIE
 from .meta import METAIE


@@ -656,6 +667,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


@@ -724,10 +737,14 @@ from .openload import OpenloadIE
 from .ora import OraTVIE
 from .orf import (
     ORFTVthekIE,
 from .ora import OraTVIE
 from .orf import (
     ORFTVthekIE,

-    ORFOE1IE,

     ORFFM4IE,
     ORFFM4IE,

+    ORFOE1IE,

     ORFIPTVIE,
 )
     ORFIPTVIE,
 )

+from .packtpub import (
+    PacktPubIE,
+    PacktPubCourseIE,
+)

 from .pandatv import PandaTVIE
 from .pandoratv import PandoraTVIE
 from .parliamentliveuk import ParliamentLiveUKIE
 from .pandatv import PandaTVIE
 from .pandoratv import PandoraTVIE
 from .parliamentliveuk import ParliamentLiveUKIE


@@ -797,7 +814,7 @@ from .radiojavan import RadioJavanIE
 from .radiobremen import RadioBremenIE
 from .radiofrance import RadioFranceIE
 from .rai import (
 from .radiobremen import RadioBremenIE
 from .radiofrance import RadioFranceIE
 from .rai import (

-    RaiTVIE,
+    RaiPlayIE,

     RaiIE,
 )
 from .rbmaradio import RBMARadioIE
     RaiIE,
 )
 from .rbmaradio import RBMARadioIE


@@ -828,7 +845,11 @@ from .rozhlas import RozhlasIE
 from .rtbf import RTBFIE
 from .rte import RteIE, RteRadioIE
 from .rtlnl import RtlNlIE
 from .rtbf import RTBFIE
 from .rte import RteIE, RteRadioIE
 from .rtlnl import RtlNlIE

-from .rtl2 import RTL2IE
+from .rtl2 import (
+    RTL2IE,
+    RTL2YouIE,
+    RTL2YouSeriesIE,
+)

 from .rtp import RTPIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE
 from .rtp import RTPIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE, RTVELiveIE, RTVETelevisionIE


@@ -924,6 +945,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


@@ -970,6 +992,7 @@ from .theplatform import (
 from .thescene import TheSceneIE
 from .thesixtyone import TheSixtyOneIE
 from .thestar import TheStarIE
 from .thescene import TheSceneIE
 from .thesixtyone import TheSixtyOneIE
 from .thestar import TheStarIE

+from .thesun import TheSunIE

 from .theweatherchannel import TheWeatherChannelIE
 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE
 from .theweatherchannel import TheWeatherChannelIE
 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE


@@ -1016,8 +1039,10 @@ from .tv2 import (
     TV2IE,
     TV2ArticleIE,
 )
     TV2IE,
     TV2ArticleIE,
 )

+from .tv2hu import TV2HuIE

 from .tv3 import TV3IE
 from .tv4 import TV4IE
 from .tv3 import TV3IE
 from .tv4 import TV4IE

+from .tv5mondeplus import TV5MondePlusIE

 from .tva import TVAIE
 from .tvanouvelles import (
     TVANouvellesIE,
 from .tva import TVAIE
 from .tvanouvelles import (
     TVANouvellesIE,


@@ -1078,6 +1103,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


@@ -1105,6 +1134,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


@@ -1177,6 +1207,11 @@ from .voxmedia import 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

+from .vrv import (
+    VRVIE,
+    VRVSeriesIE,
+)
+from .vshare import VShareIE

 from .medialaan import MedialaanIE
 from .vube import VubeIE
 from .vuclip import VuClipIE
 from .medialaan import MedialaanIE
 from .vube import VubeIE
 from .vuclip import VuClipIE


@@ -1210,7 +1245,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


@@ -1272,5 +1310,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