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

Merge branch 'ruutu' of https://github.com/hlintala/youtube-dl into hlintala-ruutu
---

717b0239fd63aad32a67988dec457250f1893958
diff --combined youtube_dl/extractor/__init__.py
index 67eb96057,860023d14..631381eea
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -141,7 -141,6 +141,7 @@@ from .engadget import EngadgetI
  from .eporner import EpornerIE
  from .eroprofile import EroProfileIE
  from .escapist import EscapistIE
 +from .espn import ESPNIE
  from .everyonesmixtape import EveryonesMixtapeIE
  from .exfm import ExfmIE
  from .expotv import ExpoTVIE
@@@ -149,6 -148,7 +149,6 @@@ 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
@@@ -243,7 -243,6 +243,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
@@@ -338,7 -337,8 +338,7 @@@ from .newstube import NewstubeI
  from .nextmedia import (
      NextMediaIE,
      NextMediaActionNewsIE,
 -    AppleDailyRealtimeNewsIE,
 -    AppleDailyAnimationNewsIE
 +    AppleDailyIE,
  )
  from .nfb import NFBIE
  from .nfl import NFLIE
@@@ -352,10 -352,8 +352,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,
@@@ -378,10 -376,7 +378,10 @@@ from .nytimes import 
  from .nuvid import NuvidIE
  from .odnoklassniki import OdnoklassnikiIE
  from .oktoberfesttv import OktoberfestTVIE
 -from .ooyala import OoyalaIE
 +from .ooyala import (
 +    OoyalaIE,
 +    OoyalaExternalIE,
 +)
  from .openfilm import OpenFilmIE
  from .orf import (
      ORFTVthekIE,
@@@ -402,7 -397,6 +402,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,
@@@ -440,6 -434,7 +440,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
@@@ -453,6 -448,7 +453,7 @@@ from .rutube import 
      RutubePersonIE,
  )
  from .rutv import RUTVIE
+ from .ruutu import RuutuIE
  from .sandia import SandiaIE
  from .safari import (
      SafariIE,
@@@ -481,11 -477,8 +482,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,
@@@ -510,10 -503,7 +511,10 @@@ from .spiegel import SpiegelIE, Spiegel
  from .spiegeltv import SpiegeltvIE
  from .spike import SpikeIE
  from .sport5 import Sport5IE
 -from .sportbox import SportBoxIE
 +from .sportbox import (
 +    SportBoxIE,
 +    SportBoxEmbedIE,
 +)
  from .sportdeutschland import SportDeutschlandIE
  from .srf import SrfIE
  from .srmediathek import SRMediathekIE
@@@ -571,16 -561,11 +572,16 @@@ 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
  from .turbo import TurboIE
  from .tutv import TutvIE
 +from .tv2 import (
 +    TV2IE,
 +    TV2ArticleIE,
 +)
  from .tv4 import TV4IE
  from .tvigle import TvigleIE
  from .tvp import TvpIE, TvpSeriesIE
@@@ -652,10 -637,7 +653,10 @@@ from .vine import 
      VineIE,
      VineUserIE,
  )
 -from .viki import VikiIE
 +from .viki import (
 +    VikiIE,
 +    VikiChannelIE,
 +)
  from .vk import (
      VKIE,
      VKUserVideosIE,