From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Tue, 9 Jan 2018 09:31:52 +0000 (+0800)
Subject: Merge branch 'weibo' of https://github.com/sprhawk/youtube-dl into sprhawk-weibo
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=1dd38dc0f40a7c3adbd9e346aa603d8ac566045a;hp=-c

Merge branch 'weibo' of https://github.com/sprhawk/youtube-dl into sprhawk-weibo
---

1dd38dc0f40a7c3adbd9e346aa603d8ac566045a
diff --combined youtube_dl/extractor/extractors.py
index fb0997d39,e863f03ab..a3ad4df1f
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@@ -205,6 -205,7 +205,6 @@@ from .cnn import 
      CNNArticleIE,
  )
  from .coub import CoubIE
 -from .collegerama import CollegeRamaIE
  from .comedycentral import (
      ComedyCentralFullEpisodesIE,
      ComedyCentralIE,
@@@ -344,7 -345,6 +344,7 @@@ from .filmon import 
      FilmOnIE,
      FilmOnChannelIE,
  )
 +from .filmweb import FilmwebIE
  from .firsttv import FirstTVIE
  from .fivemin import FiveMinIE
  from .fivetv import FiveTVIE
@@@ -465,7 -465,6 +465,7 @@@ from .indavideo import 
  )
  from .infoq import InfoQIE
  from .instagram import InstagramIE, InstagramUserIE
 +from .internazionale import InternazionaleIE
  from .internetvideoarchive import InternetVideoArchiveIE
  from .iprima import IPrimaIE
  from .iqiyi import IqiyiIE
@@@ -575,7 -574,6 +575,7 @@@ from .massengeschmacktv import Massenge
  from .matchtv import MatchTVIE
  from .mdr import MDRIE
  from .mediaset import MediasetIE
 +from .mediasite import MediasiteIE
  from .medici import MediciIE
  from .megaphone import MegaphoneIE
  from .meipai import MeipaiIE
@@@ -609,10 -607,7 +609,10 @@@ from .mofosex import MofosexI
  from .mojvideo import MojvideoIE
  from .moniker import MonikerIE
  from .morningstar import MorningstarIE
 -from .motherless import MotherlessIE
 +from .motherless import (
 +    MotherlessIE,
 +    MotherlessGroupIE
 +)
  from .motorsport import MotorsportIE
  from .movieclips import MovieClipsIE
  from .moviezine import MoviezineIE
@@@ -915,6 -910,7 +915,6 @@@ from .rutube import 
  from .rutv import RUTVIE
  from .ruutu import RuutuIE
  from .ruv import RuvIE
 -from .sandia import SandiaIE
  from .safari import (
      SafariIE,
      SafariApiIE,
@@@ -1124,7 -1120,6 +1124,7 @@@ from .tvplayer import TVPlayerI
  from .tweakers import TweakersIE
  from .twentyfourvideo import TwentyFourVideoIE
  from .twentymin import TwentyMinutenIE
 +from .twentythreevideo import TwentyThreeVideoIE
  from .twitch import (
      TwitchVideoIE,
      TwitchChapterIE,
@@@ -1147,7 -1142,6 +1147,7 @@@ from .udemy import 
      UdemyCourseIE
  )
  from .udn import UDNEmbedIE
 +from .ufctv import UFCTVIE
  from .uktvplay import UKTVPlayIE
  from .digiteka import DigitekaIE
  from .umg import UMGDeIE
@@@ -1298,6 -1292,10 +1298,10 @@@ from .webofstories import 
      WebOfStoriesIE,
      WebOfStoriesPlaylistIE,
  )
+ from .weibo import (
+     WeiboIE, 
+     WeiboMobileIE
+ )
  from .weiqitv import WeiqiTVIE
  from .wimp import WimpIE
  from .wistia import WistiaIE