From: sprhawk <465558+sprhawk@users.noreply.github.com>
Date: Tue, 26 Dec 2017 14:27:26 +0000 (+0800)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl into weibo
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=c33de004e13da11f1ae3cad7310b36500cfb9d28;hp=-c;p=youtube-dl

Merge branch 'master' of github.com:rg3/youtube-dl into weibo
---

c33de004e13da11f1ae3cad7310b36500cfb9d28
diff --combined youtube_dl/extractor/extractors.py
index f1ea735b5,91bd3287c..e863f03ab
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@@ -138,10 -138,7 +138,7 @@@ from .brightcove import 
      BrightcoveNewIE,
  )
  from .buzzfeed import BuzzFeedIE
- from .byutv import (
-     BYUtvIE,
-     BYUtvEventIE,
- )
+ from .byutv import BYUtvIE
  from .c56 import C56IE
  from .camdemy import (
      CamdemyIE,
@@@ -246,7 -243,6 +243,6 @@@ from .dailymotion import 
      DailymotionIE,
      DailymotionPlaylistIE,
      DailymotionUserIE,
-     DailymotionCloudIE,
  )
  from .daisuki import (
      DaisukiMottoIE,
@@@ -312,9 -308,10 +308,10 @@@ from .ehow import EHowI
  from .eighttracks import EightTracksIE
  from .einthusan import EinthusanIE
  from .eitb import EitbIE
- from .ellentv import (
-     EllenTVIE,
-     EllenTVClipsIE,
+ from .ellentube import (
+     EllenTubeIE,
+     EllenTubeVideoIE,
+     EllenTubePlaylistIE,
  )
  from .elpais import ElPaisIE
  from .embedly import EmbedlyIE
@@@ -325,6 -322,7 +322,7 @@@ from .escapist import EscapistI
  from .espn import (
      ESPNIE,
      ESPNArticleIE,
+     FiveThirtyEightIE,
  )
  from .esri import EsriVideoIE
  from .etonline import ETOnlineIE
@@@ -689,6 -687,7 +687,7 @@@ from .nhl import 
  )
  from .nick import (
      NickIE,
+     NickBrIE,
      NickDeIE,
      NickNightIE,
      NickRuIE,
@@@ -721,10 -720,6 +720,6 @@@ from .nowness import 
      NownessPlaylistIE,
      NownessSeriesIE,
  )
- from .nowtv import (
-     NowTVIE,
-     NowTVListIE,
- )
  from .noz import NozIE
  from .npo import (
      AndereTijdenIE,
@@@ -857,6 -852,7 +852,7 @@@ from .radiofrance import RadioFranceI
  from .rai import (
      RaiPlayIE,
      RaiPlayLiveIE,
+     RaiPlayPlaylistIE,
      RaiIE,
  )
  from .rbmaradio import RBMARadioIE
@@@ -931,8 -927,12 +927,12 @@@ from .senateisvp import SenateISVPI
  from .sendtonews import SendtoNewsIE
  from .servingsys import ServingSysIE
  from .servus import ServusIE
+ from .sevenplus import SevenPlusIE
  from .sexu import SexuIE
- from .shahid import ShahidIE
+ from .shahid import (
+     ShahidIE,
+     ShahidShowIE,
+ )
  from .shared import (
      SharedIE,
      VivoIE,
@@@ -1000,6 -1000,7 +1000,7 @@@ from .streamango import StreamangoI
  from .streamcloud import StreamcloudIE
  from .streamcz import StreamCZIE
  from .streetvoice import StreetVoiceIE
+ from .stretchinternet import StretchInternetIE
  from .sunporno import SunPornoIE
  from .svt import (
      SVTIE,
@@@ -1102,6 -1103,10 +1103,10 @@@ from .tvigle import TvigleI
  from .tvland import TVLandIE
  from .tvn24 import TVN24IE
  from .tvnoe import TVNoeIE
+ from .tvnow import (
+     TVNowIE,
+     TVNowListIE,
+ )
  from .tvp import (
      TVPEmbedIE,
      TVPIE,
@@@ -1139,6 -1144,7 +1144,7 @@@ from .udemy import 
  from .udn import UDNEmbedIE
  from .uktvplay import UKTVPlayIE
  from .digiteka import DigitekaIE
+ from .umg import UMGDeIE
  from .unistra import UnistraIE
  from .unity import UnityIE
  from .uol import UOLIE
@@@ -1286,10 -1292,6 +1292,10 @@@ from .webofstories import 
      WebOfStoriesIE,
      WebOfStoriesPlaylistIE,
  )
 +from .weibo import (
 +    WeiboIE, 
 +    WeiboMobileIE
 +)
  from .weiqitv import WeiqiTVIE
  from .wimp import WimpIE
  from .wistia import WistiaIE