From: Sergey M․ <dstftw@gmail.com>
Date: Sat, 13 Jun 2015 22:56:54 +0000 (+0600)
Subject: Merge branch 'dramafever' of https://github.com/ping/youtube-dl into ping-dramafever
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=ad49fe7c8f22c78a001eb1a53d7df9ef54424b89;hp=-c;p=youtube-dl

Merge branch 'dramafever' of https://github.com/ping/youtube-dl into ping-dramafever
---

ad49fe7c8f22c78a001eb1a53d7df9ef54424b89
diff --combined youtube_dl/extractor/__init__.py
index 3bc62e9d5,ca857a75f..6fdaf90b2
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -112,6 -112,10 +112,10 @@@ from .dfb import DFBI
  from .dhm import DHMIE
  from .dotsub import DotsubIE
  from .douyutv import DouyuTVIE
+ from .dramafever import (
+     DramaFeverIE,
+     DramaFeverSeriesIE,
+ )
  from .dreisat import DreiSatIE
  from .drbonanza import DRBonanzaIE
  from .drtuber import DrTuberIE
@@@ -149,10 -153,10 +153,10 @@@ from .extremetube import ExtremeTubeI
  from .facebook import FacebookIE
  from .faz import FazIE
  from .fc2 import FC2IE
 -from .firedrive import FiredriveIE
  from .firstpost import FirstpostIE
  from .firsttv import FirstTVIE
  from .fivemin import FiveMinIE
 +from .fivetv import FiveTVIE
  from .fktv import (
      FKTVIE,
      FKTVPosteckeIE,
@@@ -230,7 -234,6 +234,7 @@@ from .infoq import InfoQI
  from .instagram import InstagramIE, InstagramUserIE
  from .internetvideoarchive import InternetVideoArchiveIE
  from .iprima import IPrimaIE
 +from .iqiyi import IqiyiIE
  from .ivi import (
      IviIE,
      IviCompilationIE
@@@ -245,7 -248,6 +249,7 @@@ from .kaltura import KalturaI
  from .kanalplay import KanalPlayIE
  from .kankan import KankanIE
  from .karaoketv import KaraoketvIE
 +from .karrierevideos import KarriereVideosIE
  from .keezmovies import KeezMoviesIE
  from .khanacademy import KhanAcademyIE
  from .kickstarter import KickStarterIE
@@@ -340,7 -342,8 +344,7 @@@ from .newstube import NewstubeI
  from .nextmedia import (
      NextMediaIE,
      NextMediaActionNewsIE,
 -    AppleDailyRealtimeNewsIE,
 -    AppleDailyAnimationNewsIE
 +    AppleDailyIE,
  )
  from .nfb import NFBIE
  from .nfl import NFLIE
@@@ -354,10 -357,8 +358,10 @@@ from .ninegag import NineGagI
  from .noco import NocoIE
  from .normalboots import NormalbootsIE
  from .nosvideo import NosVideoIE
 +from .nova import NovaIE
  from .novamov import NovaMovIE
  from .nowness import NownessIE
 +from .nowtv import NowTVIE
  from .nowvideo import NowVideoIE
  from .npo import (
      NPOIE,
@@@ -404,7 -405,6 +408,7 @@@ from .playfm import PlayFMI
  from .playvid import PlayvidIE
  from .playwire import PlaywireIE
  from .podomatic import PodomaticIE
 +from .porn91 import Porn91IE
  from .pornhd import PornHdIE
  from .pornhub import (
      PornHubIE,
@@@ -442,6 -442,7 +446,6 @@@ from .roxwel import RoxwelI
  from .rtbf import RTBFIE
  from .rte import RteIE
  from .rtlnl import RtlNlIE
 -from .rtlnow import RTLnowIE
  from .rtl2 import RTL2IE
  from .rtp import RTPIE
  from .rts import RTSIE
@@@ -455,7 -456,6 +459,7 @@@ from .rutube import 
      RutubePersonIE,
  )
  from .rutv import RUTVIE
 +from .ruutu import RuutuIE
  from .sandia import SandiaIE
  from .safari import (
      SafariIE,
@@@ -484,11 -484,8 +488,11 @@@ from .smotri import 
      SmotriBroadcastIE,
  )
  from .snotr import SnotrIE
 -from .sockshare import SockshareIE
  from .sohu import SohuIE
 +from .soompi import (
 +    SoompiIE,
 +    SoompiShowIE,
 +)
  from .soundcloud import (
      SoundcloudIE,
      SoundcloudSetIE,
@@@ -574,7 -571,6 +578,7 @@@ from .traileraddict import TrailerAddic
  from .trilulilu import TriluliluIE
  from .trutube import TruTubeIE
  from .tube8 import Tube8IE
 +from .tubitv import TubiTvIE
  from .tudou import TudouIE
  from .tumblr import TumblrIE
  from .tunein import TuneInIE
@@@ -585,10 -581,6 +589,10 @@@ from .tv2 import 
      TV2ArticleIE,
  )
  from .tv4 import TV4IE
 +from .tvc import (
 +    TVCIE,
 +    TVCArticleIE,
 +)
  from .tvigle import TvigleIE
  from .tvp import TvpIE, TvpSeriesIE
  from .tvplay import TVPlayIE
@@@ -659,10 -651,7 +663,10 @@@ from .vine import 
      VineIE,
      VineUserIE,
  )
 -from .viki import VikiIE
 +from .viki import (
 +    VikiIE,
 +    VikiChannelIE,
 +)
  from .vk import (
      VKIE,
      VKUserVideosIE,