From: remitamine <remitamine@gmail.com>
Date: Tue, 29 Dec 2015 09:57:45 +0000 (+0100)
Subject: Merge branch 'srgssr' of https://github.com/remitamine/youtube-dl into remitamine... 
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=b19ad2fb53c43c573d22663a739d192509bd8097;hp=-c;p=youtube-dl.git

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

b19ad2fb53c43c573d22663a739d192509bd8097
diff --combined youtube_dl/extractor/__init__.py
index ec1f80155,042ad3678..e46d73ed7
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -3,18 -3,13 +3,18 @@@ from __future__ import unicode_literal
  from .abc import ABCIE
  from .abc7news import Abc7NewsIE
  from .academicearth import AcademicEarthCourseIE
 +from .acast import (
 +    ACastIE,
 +    ACastChannelIE,
 +)
  from .addanime import AddAnimeIE
  from .adobetv import (
      AdobeTVIE,
 +    AdobeTVShowIE,
 +    AdobeTVChannelIE,
      AdobeTVVideoIE,
  )
  from .adultswim import AdultSwimIE
 -from .aftenposten import AftenpostenIE
  from .aftonbladet import AftonbladetIE
  from .airmozilla import AirMozillaIE
  from .aljazeera import AlJazeeraIE
@@@ -25,10 -20,7 +25,10 @@@ from .aol import AolI
  from .allocine import AllocineIE
  from .aparat import AparatIE
  from .appleconnect import AppleConnectIE
 -from .appletrailers import AppleTrailersIE
 +from .appletrailers import (
 +    AppleTrailersIE,
 +    AppleTrailersSectionIE,
 +)
  from .archiveorg import ArchiveOrgIE
  from .ard import (
      ARDIE,
@@@ -46,7 -38,6 +46,7 @@@ from .arte import 
  )
  from .atresplayer import AtresPlayerIE
  from .atttechchannel import ATTTechChannelIE
 +from .audimedia import AudiMediaIE
  from .audiomack import AudiomackIE, AudiomackAlbumIE
  from .azubu import AzubuIE
  from .baidu import BaiduVideoIE
@@@ -54,7 -45,6 +54,7 @@@ from .bambuser import BambuserIE, Bambu
  from .bandcamp import BandcampIE, BandcampAlbumIE
  from .bbc import (
      BBCCoUkIE,
 +    BBCCoUkArticleIE,
      BBCIE,
  )
  from .beeg import BeegIE
@@@ -63,19 -53,13 +63,19 @@@ from .beatportpro import BeatportProI
  from .bet import BetIE
  from .bild import BildIE
  from .bilibili import BiliBiliIE
 +from .bleacherreport import (
 +    BleacherReportIE,
 +    BleacherReportCMSIE,
 +)
  from .blinkx import BlinkxIE
 -from .bliptv import BlipTVIE, BlipTVUserIE
  from .bloomberg import BloombergIE
  from .bpb import BpbIE
  from .br import BRIE
  from .breakcom import BreakIE
 -from .brightcove import BrightcoveIE
 +from .brightcove import (
 +    BrightcoveLegacyIE,
 +    BrightcoveNewIE,
 +)
  from .buzzfeed import BuzzFeedIE
  from .byutv import BYUtvIE
  from .c56 import C56IE
@@@ -83,6 -67,7 +83,6 @@@ from .camdemy import 
      CamdemyIE,
      CamdemyFolderIE
  )
 -from .canal13cl import Canal13clIE
  from .canalplus import CanalplusIE
  from .canalc2 import Canalc2IE
  from .cbs import CBSIE
@@@ -91,7 -76,6 +91,7 @@@ from .cbssports import CBSSportsI
  from .ccc import CCCIE
  from .ceskatelevize import CeskaTelevizeIE
  from .channel9 import Channel9IE
 +from .chaturbate import ChaturbateIE
  from .chilloutzone import ChilloutzoneIE
  from .chirbit import (
      ChirbitIE,
@@@ -104,7 -88,6 +104,7 @@@ from .cliphunter import CliphunterI
  from .clipsyndicate import ClipsyndicateIE
  from .cloudy import CloudyIE
  from .clubic import ClubicIE
 +from .clyp import ClypIE
  from .cmt import CMTIE
  from .cnet import CNETIE
  from .cnn import (
@@@ -133,25 -116,15 +133,25 @@@ from .dailymotion import 
      DailymotionUserIE,
      DailymotionCloudIE,
  )
 -from .daum import DaumIE
 +from .daum import (
 +    DaumIE,
 +    DaumClipIE,
 +)
  from .dbtv import DBTVIE
 -from .dcn import DCNIE
 +from .dcn import (
 +    DCNIE,
 +    DCNVideoIE,
 +    DCNLiveIE,
 +    DCNSeasonIE,
 +)
  from .dctp import DctpTvIE
  from .deezer import DeezerPlaylistIE
 +from .democracynow import DemocracynowIE
  from .dfb import DFBIE
  from .dhm import DHMIE
  from .dotsub import DotsubIE
  from .douyutv import DouyuTVIE
 +from .dplay import DPlayIE
  from .dramafever import (
      DramaFeverIE,
      DramaFeverSeriesIE,
@@@ -193,7 -166,6 +193,7 @@@ from .extremetube import ExtremeTubeI
  from .facebook import FacebookIE
  from .faz import FazIE
  from .fc2 import FC2IE
 +from .fczenit import FczenitIE
  from .firstpost import FirstpostIE
  from .firsttv import FirstTVIE
  from .fivemin import FiveMinIE
@@@ -206,10 -178,7 +206,10 @@@ from .fourtube import FourTubeI
  from .foxgay import FoxgayIE
  from .foxnews import FoxNewsIE
  from .foxsports import FoxSportsIE
 -from .franceculture import FranceCultureIE
 +from .franceculture import (
 +    FranceCultureIE,
 +    FranceCultureEmissionIE,
 +)
  from .franceinter import FranceInterIE
  from .francetv import (
      PluzzIE,
@@@ -221,9 -190,7 +221,9 @@@
  from .freesound import FreesoundIE
  from .freespeech import FreespeechIE
  from .freevideo import FreeVideoIE
 +from .funimation import FunimationIE
  from .funnyordie import FunnyOrDieIE
 +from .gameinformer import GameInformerIE
  from .gamekings import GamekingsIE
  from .gameone import (
      GameOneIE,
@@@ -240,18 -207,14 +240,18 @@@ from .gfycat import GfycatI
  from .giantbomb import GiantBombIE
  from .giga import GigaIE
  from .glide import GlideIE
 -from .globo import GloboIE
 +from .globo import (
 +    GloboIE,
 +    GloboArticleIE,
 +)
  from .godtube import GodTubeIE
  from .goldenmoustache import GoldenMoustacheIE
  from .golem import GolemIE
 +from .googledrive import GoogleDriveIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
 -from .gorillavid import GorillaVidIE
  from .goshgay import GoshgayIE
 +from .gputechconf import GPUTechConfIE
  from .groupon import GrouponIE
  from .hark import HarkIE
  from .hearthisat import HearThisAtIE
@@@ -264,17 -227,12 +264,17 @@@ from .history import HistoryI
  from .hitbox import HitboxIE, HitboxLiveIE
  from .hornbunny import HornBunnyIE
  from .hotnewhiphop import HotNewHipHopIE
 +from .hotstar import HotStarIE
  from .howcast import HowcastIE
  from .howstuffworks import HowStuffWorksIE
  from .huffpost import HuffPostIE
  from .hypem import HypemIE
  from .iconosquare import IconosquareIE
 -from .ign import IGNIE, OneUPIE
 +from .ign import (
 +    IGNIE,
 +    OneUPIE,
 +    PCMagIE,
 +)
  from .imdb import (
      ImdbIE,
      ImdbListIE
@@@ -303,7 -261,6 +303,7 @@@ from .jadorecettepub import JadoreCette
  from .jeuxvideo import JeuxVideoIE
  from .jove import JoveIE
  from .jukebox import JukeboxIE
 +from .jwplatform import JWPlatformIE
  from .jpopsukitv import JpopsukiIE
  from .kaltura import KalturaIE
  from .kanalplay import KanalPlayIE
@@@ -358,9 -315,9 +358,9 @@@ from .lynda import 
  from .m6 import M6IE
  from .macgamestore import MacGameStoreIE
  from .mailru import MailRuIE
 +from .makertv import MakerTVIE
  from .malemotion import MalemotionIE
  from .mdr import MDRIE
 -from .megavideoz import MegaVideozIE
  from .metacafe import MetacafeIE
  from .metacritic import MetacriticIE
  from .mgoon import MgoonIE
@@@ -382,6 -339,7 +382,6 @@@ from .motherless import MotherlessI
  from .motorsport import MotorsportIE
  from .movieclips import MovieClipsIE
  from .moviezine import MoviezineIE
 -from .movshare import MovShareIE
  from .mtv import (
      MTVIE,
      MTVServicesEmbeddedIE,
@@@ -447,22 -405,14 +447,22 @@@ from .noco import NocoI
  from .normalboots import NormalbootsIE
  from .nosvideo import NosVideoIE
  from .nova import NovaIE
 -from .novamov import NovaMovIE
 +from .novamov import (
 +    NovaMovIE,
 +    WholeCloudIE,
 +    NowVideoIE,
 +    VideoWeedIE,
 +    CloudTimeIE,
 +)
  from .nowness import (
      NownessIE,
      NownessPlaylistIE,
      NownessSeriesIE,
  )
 -from .nowtv import NowTVIE
 -from .nowvideo import NowVideoIE
 +from .nowtv import (
 +    NowTVIE,
 +    NowTVListIE,
 +)
  from .npo import (
      NPOIE,
      NPOLiveIE,
@@@ -499,7 -449,10 +499,7 @@@ from .orf import 
  from .parliamentliveuk import ParliamentLiveUKIE
  from .patreon import PatreonIE
  from .pbs import PBSIE
 -from .periscope import (
 -    PeriscopeIE,
 -    QuickscopeIE,
 -)
 +from .periscope import PeriscopeIE
  from .philharmoniedeparis import PhilharmonieDeParisIE
  from .phoenix import PhoenixIE
  from .photobucket import PhotobucketIE
@@@ -543,10 -496,7 +543,10 @@@ from .radiode import RadioDeI
  from .radiojavan import RadioJavanIE
  from .radiobremen import RadioBremenIE
  from .radiofrance import RadioFranceIE
 -from .rai import RaiIE
 +from .rai import (
 +    RaiTVIE,
 +    RaiIE,
 +)
  from .rbmaradio import RBMARadioIE
  from .rds import RDSIE
  from .redtube import RedTubeIE
@@@ -594,10 -544,6 +594,10 @@@ from .shahid import ShahidI
  from .shared import SharedIE
  from .sharesix import ShareSixIE
  from .sina import SinaIE
 +from .skynewsarabia import (
 +    SkyNewsArabiaIE,
 +    SkyNewsArabiaArticleIE,
 +)
  from .slideshare import SlideshareIE
  from .slutload import SlutloadIE
  from .smotri import (
@@@ -612,12 -558,15 +612,12 @@@ from .snagfilms import 
  )
  from .snotr import SnotrIE
  from .sohu import SohuIE
 -from .soompi import (
 -    SoompiIE,
 -    SoompiShowIE,
 -)
  from .soundcloud import (
      SoundcloudIE,
      SoundcloudSetIE,
      SoundcloudUserIE,
 -    SoundcloudPlaylistIE
 +    SoundcloudPlaylistIE,
 +    SoundcloudSearchIE
  )
  from .soundgasm import (
      SoundgasmIE,
@@@ -636,14 -585,16 +636,17 @@@ from .spankwire import SpankwireI
  from .spiegel import SpiegelIE, SpiegelArticleIE
  from .spiegeltv import SpiegeltvIE
  from .spike import SpikeIE
 +from .stitcher import StitcherIE
  from .sport5 import Sport5IE
  from .sportbox import (
      SportBoxIE,
      SportBoxEmbedIE,
  )
  from .sportdeutschland import SportDeutschlandIE
- from .srf import SrfIE
+ from .srgssr import (
+     SRGSSRIE,
+     SRGSSRPlayIE,
+ )
  from .srmediathek import SRMediathekIE
  from .ssa import SSAIE
  from .stanfordoc import StanfordOpenClassroomIE
@@@ -670,7 -621,6 +673,7 @@@ from .teachingchannel import TeachingCh
  from .teamcoco import TeamcocoIE
  from .techtalks import TechTalksIE
  from .ted import TEDIE
 +from .tele13 import Tele13IE
  from .telebruxelles import TeleBruxellesIE
  from .telecinco import TelecincoIE
  from .telegraaf import TelegraafIE
@@@ -680,7 -630,6 +683,7 @@@ from .tenplay import TenPlayI
  from .testurl import TestURLIE
  from .testtube import TestTubeIE
  from .tf1 import TF1IE
 +from .theintercept import TheInterceptIE
  from .theonion import TheOnionIE
  from .theplatform import (
      ThePlatformIE,
@@@ -700,7 -649,6 +703,7 @@@ from .tnaflix import 
      EMPFlixIE,
      MovieFapIE,
  )
 +from .toggle import ToggleIE
  from .thvideo import (
      THVideoIE,
      THVideoPlaylistIE
@@@ -714,13 -662,7 +717,13 @@@ from .tube8 import Tube8I
  from .tubitv import TubiTvIE
  from .tudou import TudouIE
  from .tumblr import TumblrIE
 -from .tunein import TuneInIE
 +from .tunein import (
 +    TuneInClipIE,
 +    TuneInStationIE,
 +    TuneInProgramIE,
 +    TuneInTopicIE,
 +    TuneInShortenerIE,
 +)
  from .turbo import TurboIE
  from .tutv import TutvIE
  from .tv2 import (
@@@ -750,7 -692,7 +753,7 @@@ from .twitch import 
      TwitchBookmarksIE,
      TwitchStreamIE,
  )
 -from .twitter import TwitterCardIE
 +from .twitter import TwitterCardIE, TwitterIE
  from .ubu import UbuIE
  from .udemy import (
      UdemyIE,
@@@ -777,15 -719,16 +780,15 @@@ from .vh1 import VH1I
  from .vice import ViceIE
  from .viddler import ViddlerIE
  from .videodetective import VideoDetectiveIE
 -from .videolecturesnet import VideoLecturesNetIE
  from .videofyme import VideofyMeIE
  from .videomega import VideoMegaIE
  from .videopremium import VideoPremiumIE
  from .videott import VideoTtIE
 -from .videoweed import VideoWeedIE
  from .vidme import VidmeIE
  from .vidzi import VidziIE
  from .vier import VierIE, VierVideosIE
  from .viewster import ViewsterIE
 +from .viidea import ViideaIE
  from .vimeo import (
      VimeoIE,
      VimeoAlbumIE,
@@@ -838,7 -781,6 +841,7 @@@ from .wrzuta import WrzutaI
  from .wsj import WSJIE
  from .xbef import XBefIE
  from .xboxclips import XboxClipsIE
 +from .xfileshare import XFileShareIE
  from .xhamster import (
      XHamsterIE,
      XHamsterEmbedIE,
@@@ -882,7 -824,6 +885,7 @@@ from .youtube import 
      YoutubeTruncatedIDIE,
      YoutubeTruncatedURLIE,
      YoutubeUserIE,
 +    YoutubePlaylistsIE,
      YoutubeWatchLaterIE,
  )
  from .zapiks import ZapiksIE