From: Sergey M․ <dstftw@gmail.com>
Date: Fri, 19 Jun 2015 17:00:00 +0000 (+0600)
Subject: Merge branch 'pinkbike' of https://github.com/misterhat/youtube-dl into misterhat... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=c8e337450b63c3e3d93d1d6badf9475d0757690f;hp=-c;p=youtube-dl

Merge branch 'pinkbike' of https://github.com/misterhat/youtube-dl into misterhat-pinkbike
---

c8e337450b63c3e3d93d1d6badf9475d0757690f
diff --combined youtube_dl/extractor/__init__.py
index 6fdaf90b2,80bec39da..6c548d8e9
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -112,10 -112,6 +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
@@@ -153,10 -149,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,
@@@ -234,7 -230,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
@@@ -358,10 -353,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,
@@@ -401,6 -394,7 +401,7 @@@ from .pbs import PBSI
  from .philharmoniedeparis import PhilharmonieDeParisIE
  from .phoenix import PhoenixIE
  from .photobucket import PhotobucketIE
+ from .pinkbike import PinkbikeIE
  from .planetaplay import PlanetaPlayIE
  from .pladform import PladformIE
  from .played import PlayedIE
@@@ -408,7 -402,6 +409,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,
@@@ -446,6 -439,7 +447,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
@@@ -459,7 -453,6 +460,7 @@@ from .rutube import 
      RutubePersonIE,
  )
  from .rutv import RUTVIE
 +from .ruutu import RuutuIE
  from .sandia import SandiaIE
  from .safari import (
      SafariIE,
@@@ -488,11 -481,8 +489,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,
@@@ -578,7 -568,6 +579,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
@@@ -589,10 -578,6 +590,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