From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sun, 18 Oct 2015 08:49:56 +0000 (+0800)
Subject: Merge branch 'pr-twitter' of https://github.com/atomicdryad/youtube-dl into atomicdry... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=c571dea9532e468ba294b933d16d9366baf825d5;hp=-c;p=youtube-dl

Merge branch 'pr-twitter' of https://github.com/atomicdryad/youtube-dl into atomicdryad-pr-twitter
---

c571dea9532e468ba294b933d16d9366baf825d5
diff --combined youtube_dl/extractor/__init__.py
index 462717b1e,5c03bf8e8..bd6eb6ae0
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -43,10 -43,7 +43,10 @@@ from .azubu import AzubuI
  from .baidu import BaiduVideoIE
  from .bambuser import BambuserIE, BambuserChannelIE
  from .bandcamp import BandcampIE, BandcampAlbumIE
 -from .bbccouk import BBCCoUkIE
 +from .bbc import (
 +    BBCCoUkIE,
 +    BBCIE,
 +)
  from .beeg import BeegIE
  from .behindkink import BehindKinkIE
  from .beatportpro import BeatportProIE
@@@ -76,7 -73,6 +76,7 @@@ from .cbssports import CBSSportsI
  from .ccc import CCCIE
  from .ceskatelevize import CeskaTelevizeIE
  from .channel9 import Channel9IE
 +from .chaturbate import ChaturbateIE
  from .chilloutzone import ChilloutzoneIE
  from .chirbit import (
      ChirbitIE,
@@@ -119,7 -115,6 +119,7 @@@ from .dailymotion import 
  )
  from .daum import DaumIE
  from .dbtv import DBTVIE
 +from .dcn import DCNIE
  from .dctp import DctpTvIE
  from .deezer import DeezerPlaylistIE
  from .dfb import DFBIE
@@@ -139,6 -134,7 +139,6 @@@ from .dump import DumpI
  from .dumpert import DumpertIE
  from .defense import DefenseGouvFrIE
  from .discovery import DiscoveryIE
 -from .divxstage import DivxStageIE
  from .dropbox import DropboxIE
  from .eagleplatform import EaglePlatformIE
  from .ebaumsworld import EbaumsWorldIE
@@@ -158,8 -154,6 +158,8 @@@ from .eporner import EpornerI
  from .eroprofile import EroProfileIE
  from .escapist import EscapistIE
  from .espn import ESPNIE
 +from .esri import EsriVideoIE
 +from .europa import EuropaIE
  from .everyonesmixtape import EveryonesMixtapeIE
  from .exfm import ExfmIE
  from .expotv import ExpoTVIE
@@@ -167,12 -161,14 +167,12 @@@ from .extremetube import ExtremeTubeI
  from .facebook import FacebookIE
  from .faz import FazIE
  from .fc2 import FC2IE
 +from .fczenit import FczenitIE
  from .firstpost import FirstpostIE
  from .firsttv import FirstTVIE
  from .fivemin import FiveMinIE
  from .fivetv import FiveTVIE
 -from .fktv import (
 -    FKTVIE,
 -    FKTVPosteckeIE,
 -)
 +from .fktv import FKTVIE
  from .flickr import FlickrIE
  from .folketinget import FolketingetIE
  from .footyroom import FootyRoomIE
@@@ -228,6 -224,7 +228,6 @@@ from .historicfilms import HistoricFilm
  from .history import HistoryIE
  from .hitbox import HitboxIE, HitboxLiveIE
  from .hornbunny import HornBunnyIE
 -from .hostingbulk import HostingBulkIE
  from .hotnewhiphop import HotNewHipHopIE
  from .howcast import HowcastIE
  from .howstuffworks import HowStuffWorksIE
@@@ -239,21 -236,13 +239,21 @@@ from .imdb import 
      ImdbIE,
      ImdbListIE
  )
 -from .imgur import ImgurIE
 +from .imgur import (
 +    ImgurIE,
 +    ImgurAlbumIE,
 +)
  from .ina import InaIE
 +from .indavideo import (
 +    IndavideoIE,
 +    IndavideoEmbedIE,
 +)
  from .infoq import InfoQIE
  from .instagram import InstagramIE, InstagramUserIE
  from .internetvideoarchive import InternetVideoArchiveIE
  from .iprima import IPrimaIE
  from .iqiyi import IqiyiIE
 +from .ir90tv import Ir90TvIE
  from .ivi import (
      IviIE,
      IviCompilationIE
@@@ -286,7 -275,6 +286,7 @@@ from .kuwo import 
  )
  from .la7 import LA7IE
  from .laola1tv import Laola1TvIE
 +from .lecture2go import Lecture2GoIE
  from .letv import (
      LetvIE,
      LetvTvIE,
@@@ -297,11 -285,6 +297,11 @@@ from .lifenews import 
      LifeNewsIE,
      LifeEmbedIE,
  )
 +from .limelight import (
 +    LimelightMediaIE,
 +    LimelightChannelIE,
 +    LimelightChannelListIE,
 +)
  from .liveleak import LiveLeakIE
  from .livestream import (
      LivestreamIE,
@@@ -319,6 -302,7 +319,6 @@@ from .macgamestore import MacGameStoreI
  from .mailru import MailRuIE
  from .malemotion import MalemotionIE
  from .mdr import MDRIE
 -from .megavideoz import MegaVideozIE
  from .metacafe import MetacafeIE
  from .metacritic import MetacriticIE
  from .mgoon import MgoonIE
@@@ -345,12 -329,11 +345,12 @@@ from .mtv import 
      MTVIE,
      MTVServicesEmbeddedIE,
      MTVIggyIE,
 +    MTVDEIE,
  )
  from .muenchentv import MuenchenTVIE
  from .musicplayon import MusicPlayOnIE
 -from .musicvault import MusicVaultIE
  from .muzu import MuzuTVIE
 +from .mwave import MwaveIE
  from .myspace import MySpaceIE, MySpaceAlbumIE
  from .myspass import MySpassIE
  from .myvi import MyviIE
@@@ -364,14 -347,10 +364,14 @@@ from .nbc import 
      NBCNewsIE,
      NBCSportsIE,
      NBCSportsVPlayerIE,
 +    MSNBCIE,
  )
  from .ndr import (
      NDRIE,
      NJoyIE,
 +    NDREmbedBaseIE,
 +    NDREmbedIE,
 +    NJoyEmbedIE,
  )
  from .ndtv import NDTVIE
  from .netzkino import NetzkinoIE
@@@ -407,11 -386,7 +407,11 @@@ from .normalboots import NormalbootsI
  from .nosvideo import NosVideoIE
  from .nova import NovaIE
  from .novamov import NovaMovIE
 -from .nowness import NownessIE
 +from .nowness import (
 +    NownessIE,
 +    NownessPlaylistIE,
 +    NownessSeriesIE,
 +)
  from .nowtv import NowTVIE
  from .nowvideo import NowVideoIE
  from .npo import (
@@@ -441,6 -416,7 +441,6 @@@ from .ooyala import 
      OoyalaIE,
      OoyalaExternalIE,
  )
 -from .openfilm import OpenFilmIE
  from .orf import (
      ORFTVthekIE,
      ORFOE1IE,
@@@ -450,10 -426,6 +450,10 @@@
  from .parliamentliveuk import ParliamentLiveUKIE
  from .patreon import PatreonIE
  from .pbs import PBSIE
 +from .periscope import (
 +    PeriscopeIE,
 +    QuickscopeIE,
 +)
  from .philharmoniedeparis import PhilharmonieDeParisIE
  from .phoenix import PhoenixIE
  from .photobucket import PhotobucketIE
@@@ -462,13 -434,8 +462,13 @@@ from .planetaplay import PlanetaPlayI
  from .pladform import PladformIE
  from .played import PlayedIE
  from .playfm import PlayFMIE
 +from .playtvak import PlaytvakIE
  from .playvid import PlayvidIE
  from .playwire import PlaywireIE
 +from .pluralsight import (
 +    PluralsightIE,
 +    PluralsightCourseIE,
 +)
  from .podomatic import PodomaticIE
  from .porn91 import Porn91IE
  from .pornhd import PornHdIE
@@@ -514,7 -481,6 +514,7 @@@ from .rtl2 import RTL2I
  from .rtp import RTPIE
  from .rts import RTSIE
  from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE
 +from .rtvnh import RTVNHIE
  from .ruhd import RUHDIE
  from .rutube import (
      RutubeIE,
@@@ -541,7 -507,6 +541,7 @@@ from .senateisvp import SenateISVPI
  from .servingsys import ServingSysIE
  from .sexu import SexuIE
  from .sexykarma import SexyKarmaIE
 +from .shahid import ShahidIE
  from .shared import SharedIE
  from .sharesix import ShareSixIE
  from .sina import SinaIE
@@@ -621,7 -586,6 +621,7 @@@ from .techtalks import TechTalksI
  from .ted import TEDIE
  from .telebruxelles import TeleBruxellesIE
  from .telecinco import TelecincoIE
 +from .telegraaf import TelegraafIE
  from .telemb import TeleMBIE
  from .teletask import TeleTaskIE
  from .tenplay import TenPlayIE
@@@ -629,10 -593,7 +629,10 @@@ from .testurl import TestURLI
  from .testtube import TestTubeIE
  from .tf1 import TF1IE
  from .theonion import TheOnionIE
 -from .theplatform import ThePlatformIE
 +from .theplatform import (
 +    ThePlatformIE,
 +    ThePlatformFeedIE,
 +)
  from .thesixtyone import TheSixtyOneIE
  from .thisamericanlife import ThisAmericanLifeIE
  from .thisav import ThisAVIE
@@@ -690,7 -651,7 +690,7 @@@ from .twitch import 
      TwitchBookmarksIE,
      TwitchStreamIE,
  )
- from .twitter import TwitterCardIE
+ from .twitter import TwitterCardIE, TwitterIE
  from .ubu import UbuIE
  from .udemy import (
      UdemyIE,
@@@ -716,6 -677,7 +716,6 @@@ from .vgtv import 
  from .vh1 import VH1IE
  from .vice import ViceIE
  from .viddler import ViddlerIE
 -from .videobam import VideoBamIE
  from .videodetective import VideoDetectiveIE
  from .videolecturesnet import VideoLecturesNetIE
  from .videofyme import VideofyMeIE
@@@ -750,7 -712,6 +750,7 @@@ from .vk import 
      VKIE,
      VKUserVideosIE,
  )
 +from .vlive import VLiveIE
  from .vodlocker import VodlockerIE
  from .voicerepublic import VoiceRepublicIE
  from .vporn import VpornIE