From: Remita Amine <remitamine@gmail.com>
Date: Fri, 3 Feb 2017 09:15:52 +0000 (+0100)
Subject: Merge branch 'fstirlitz-filmon'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=df0588a31f42010d4d43a428ca8a8d5908a960c9;hp=-c

Merge branch 'fstirlitz-filmon'
---

df0588a31f42010d4d43a428ca8a8d5908a960c9
diff --combined youtube_dl/extractor/extractors.py
index 1d1c05d42,e4ee43ee3..aa235bec1
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@@ -30,10 -30,7 +30,10 @@@ from .aenetworks import 
      AENetworksIE,
      HistoryTopicIE,
  )
 -from .afreecatv import AfreecaTVIE
 +from .afreecatv import (
 +    AfreecaTVIE,
 +    AfreecaTVGlobalIE,
 +)
  from .airmozilla import AirMozillaIE
  from .aljazeera import AlJazeeraIE
  from .alphaporno import AlphaPornoIE
@@@ -41,7 -38,10 +41,7 @@@ from .amcnetworks import AMCNetworksI
  from .animeondemand import AnimeOnDemandIE
  from .anitube import AnitubeIE
  from .anysex import AnySexIE
 -from .aol import (
 -    AolIE,
 -    AolFeaturesIE,
 -)
 +from .aol import AolIE
  from .allocine import AllocineIE
  from .aparat import AparatIE
  from .appleconnect import AppleConnectIE
@@@ -80,10 -80,6 +80,10 @@@ from .awaan import 
      AWAANLiveIE,
      AWAANSeasonIE,
  )
 +from .azmedien import (
 +    AZMedienIE,
 +    AZMedienPlaylistIE,
 +)
  from .azubu import AzubuIE, AzubuLiveIE
  from .baidu import BaiduVideoIE
  from .bambuser import BambuserIE, BambuserChannelIE
@@@ -95,7 -91,6 +95,7 @@@ from .bbc import 
      BBCCoUkPlaylistIE,
      BBCIE,
  )
 +from .beampro import BeamProLiveIE
  from .beeg import BeegIE
  from .behindkink import BehindKinkIE
  from .bellmedia import BellMediaIE
@@@ -103,10 -98,7 +103,10 @@@ from .beatport import BeatportI
  from .bet import BetIE
  from .bigflix import BigflixIE
  from .bild import BildIE
 -from .bilibili import BiliBiliIE
 +from .bilibili import (
 +    BiliBiliIE,
 +    BiliBiliBangumiIE,
 +)
  from .biobiochiletv import BioBioChileTVIE
  from .biqle import BIQLEIE
  from .bleacherreport import (
@@@ -158,7 -150,6 +158,7 @@@ from .cbsnews import 
  )
  from .cbssports import CBSSportsIE
  from .ccc import CCCIE
 +from .ccma import CCMAIE
  from .cctv import CCTVIE
  from .cda import CDAIE
  from .ceskatelevize import CeskaTelevizeIE
@@@ -189,7 -180,6 +189,7 @@@ from .cnn import 
  from .coub import CoubIE
  from .collegerama import CollegeRamaIE
  from .comedycentral import (
 +    ComedyCentralFullEpisodesIE,
      ComedyCentralIE,
      ComedyCentralShortnameIE,
      ComedyCentralTVIE,
@@@ -254,7 -244,6 +254,7 @@@ from .dumpert import DumpertI
  from .defense import DefenseGouvFrIE
  from .discovery import DiscoveryIE
  from .discoverygo import DiscoveryGoIE
 +from .disney import DisneyIE
  from .dispeak import DigitallySpeakingIE
  from .dropbox import DropboxIE
  from .dw import (
@@@ -264,7 -253,6 +264,7 @@@
  from .eagleplatform import EaglePlatformIE
  from .ebaumsworld import EbaumsWorldIE
  from .echomsk import EchoMskIE
 +from .egghead import EggheadCourseIE
  from .ehow import EHowIE
  from .eighttracks import EightTracksIE
  from .einthusan import EinthusanIE
@@@ -299,6 -287,10 +299,10 @@@ from .fc2 import 
      FC2EmbedIE,
  )
  from .fczenit import FczenitIE
+ from .filmon import (
+     FilmOnIE,
+     FilmOnChannelIE,
+ )
  from .firstpost import FirstpostIE
  from .firsttv import FirstTVIE
  from .fivemin import FiveMinIE
@@@ -330,6 -322,7 +334,6 @@@ from .francetv import 
  )
  from .freesound import FreesoundIE
  from .freespeech import FreespeechIE
 -from .freevideo import FreeVideoIE
  from .funimation import FunimationIE
  from .funnyordie import FunnyOrDieIE
  from .fusion import FusionIE
@@@ -379,7 -372,6 +383,7 @@@ from .hgtv import 
  )
  from .historicfilms import HistoricFilmsIE
  from .hitbox import HitboxIE, HitboxLiveIE
 +from .hitrecord import HitRecordIE
  from .hornbunny import HornBunnyIE
  from .hotnewhiphop import HotNewHipHopIE
  from .hotstar import HotStarIE
@@@ -407,7 -399,6 +411,7 @@@ from .imgur import 
      ImgurAlbumIE,
  )
  from .ina import InaIE
 +from .inc import IncIE
  from .indavideo import (
      IndavideoIE,
      IndavideoEmbedIE,
@@@ -418,7 -409,6 +422,7 @@@ from .internetvideoarchive import Inter
  from .iprima import IPrimaIE
  from .iqiyi import IqiyiIE
  from .ir90tv import Ir90TvIE
 +from .itv import ITVIE
  from .ivi import (
      IviIE,
      IviCompilationIE
@@@ -459,10 -449,7 +463,10 @@@ from .kuwo import 
      KuwoMvIE,
  )
  from .la7 import LA7IE
 -from .laola1tv import Laola1TvIE
 +from .laola1tv import (
 +    Laola1TvEmbedIE,
 +    Laola1TvIE,
 +)
  from .lci import LCIIE
  from .lcp import (
      LcpPlayIE,
@@@ -514,8 -501,6 +518,8 @@@ from .mangomolo import 
  )
  from .matchtv import MatchTVIE
  from .mdr import MDRIE
 +from .meipai import MeipaiIE
 +from .melonvod import MelonVODIE
  from .meta import METAIE
  from .metacafe import MetacafeIE
  from .metacritic import MetacriticIE
@@@ -557,7 -542,6 +561,7 @@@ from .mtv import 
      MTVVideoIE,
      MTVServicesEmbeddedIE,
      MTVDEIE,
 +    MTV81IE,
  )
  from .muenchentv import MuenchenTVIE
  from .musicplayon import MusicPlayOnIE
@@@ -607,7 -591,6 +611,7 @@@ from .nextmedia import 
      NextMediaIE,
      NextMediaActionNewsIE,
      AppleDailyIE,
 +    NextTVIE,
  )
  from .nfb import NFBIE
  from .nfl import NFLIE
@@@ -669,9 -652,6 +673,9 @@@ from .nrk import 
      NRKPlaylistIE,
      NRKSkoleIE,
      NRKTVIE,
 +    NRKTVDirekteIE,
 +    NRKTVEpisodesIE,
 +    NRKTVSeriesIE,
  )
  from .ntvde import NTVDeIE
  from .ntvru import NTVRuIE
@@@ -684,7 -664,6 +688,7 @@@ from .nzz import NZZI
  from .odatv import OdaTVIE
  from .odnoklassniki import OdnoklassnikiIE
  from .oktoberfesttv import OktoberfestTVIE
 +from .ondemandkorea import OnDemandKoreaIE
  from .onet import (
      OnetIE,
      OnetChannelIE,
@@@ -715,7 -694,6 +719,7 @@@ from .periscope import 
  from .philharmoniedeparis import PhilharmonieDeParisIE
  from .phoenix import PhoenixIE
  from .photobucket import PhotobucketIE
 +from .piksel import PikselIE
  from .pinkbike import PinkbikeIE
  from .pladform import PladformIE
  from .playfm import PlayFMIE
@@@ -735,7 -713,6 +739,7 @@@ from .polskieradio import 
  )
  from .porn91 import Porn91IE
  from .porncom import PornComIE
 +from .pornflip import PornFlipIE
  from .pornhd import PornHdIE
  from .pornhub import (
      PornHubIE,
@@@ -830,6 -807,8 +834,6 @@@ from .sbs import SBSI
  from .scivee import SciVeeIE
  from .screencast import ScreencastIE
  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
@@@ -840,7 -819,7 +844,7 @@@ from .shared import 
      SharedIE,
      VivoIE,
  )
 -from .sharesix import ShareSixIE
 +from .showroomlive import ShowRoomLiveIE
  from .sina import SinaIE
  from .sixplay import SixPlayIE
  from .skynewsarabia import (
@@@ -922,7 -901,6 +926,7 @@@ from .teachertube import 
  )
  from .teachingchannel import TeachingChannelIE
  from .teamcoco import TeamcocoIE
 +from .teamfourstar import TeamFourStarIE
  from .techtalks import TechTalksIE
  from .ted import TEDIE
  from .tele13 import Tele13IE
@@@ -991,11 -969,6 +995,11 @@@ from .tv2 import 
  )
  from .tv3 import TV3IE
  from .tv4 import TV4IE
 +from .tva import TVAIE
 +from .tvanouvelles import (
 +    TVANouvellesIE,
 +    TVANouvellesArticleIE,
 +)
  from .tvc import (
      TVCIE,
      TVCArticleIE,
@@@ -1024,10 -997,7 +1028,10 @@@ from .twitch import 
      TwitchChapterIE,
      TwitchVodIE,
      TwitchProfileIE,
 +    TwitchAllVideosIE,
 +    TwitchUploadsIE,
      TwitchPastBroadcastsIE,
 +    TwitchHighlightsIE,
      TwitchStreamIE,
      TwitchClipsIE,
  )
@@@ -1041,7 -1011,6 +1045,7 @@@ from .udemy import 
      UdemyCourseIE
  )
  from .udn import UDNEmbedIE
 +from .uktvplay import UKTVPlayIE
  from .digiteka import DigitekaIE
  from .unistra import UnistraIE
  from .uol import UOLIE
@@@ -1081,7 -1050,6 +1085,7 @@@ from .vice import 
  from .viceland import VicelandIE
  from .vidbit import VidbitIE
  from .viddler import ViddlerIE
 +from .videa import VideaIE
  from .videodetective import VideoDetectiveIE
  from .videofyme import VideofyMeIE
  from .videomega import VideoMegaIE
@@@ -1091,6 -1059,7 +1095,6 @@@ from .videomore import 
      VideomoreSeasonIE,
  )
  from .videopremium import VideoPremiumIE
 -from .videott import VideoTtIE
  from .vidio import VidioIE
  from .vidme import (
      VidmeIE,
@@@ -1125,20 -1094,12 +1129,20 @@@ from .viki import 
      VikiIE,
      VikiChannelIE,
  )
 +from .viu import (
 +    ViuIE,
 +    ViuPlaylistIE,
 +    ViuOTTIE,
 +)
  from .vk import (
      VKIE,
      VKUserVideosIE,
      VKWallPostIE,
  )
 -from .vlive import VLiveIE
 +from .vlive import (
 +    VLiveIE,
 +    VLiveChannelIE
 +)
  from .vodlocker import VodlockerIE
  from .vodplatform import VODPlatformIE
  from .voicerepublic import VoiceRepublicIE
@@@ -1147,7 -1108,6 +1151,7 @@@ from .vporn import VpornI
  from .vrt import VRTIE
  from .vube import VubeIE
  from .vuclip import VuClipIE
 +from .vvvvid import VVVVIDIE
  from .vyborymos import VyboryMosIE
  from .vzaar import VzaarIE
  from .walla import WallaIE
@@@ -1161,10 -1121,6 +1165,10 @@@ from .wdr import 
      WDRIE,
      WDRMobileIE,
  )
 +from .webcaster import (
 +    WebcasterIE,
 +    WebcasterFeedIE,
 +)
  from .webofstories import (
      WebOfStoriesIE,
      WebOfStoriesPlaylistIE,