From: Sergey M․ <dstftw@gmail.com>
Date: Sat, 15 Aug 2015 10:32:06 +0000 (+0600)
Subject: Merge branch 'shahid' of https://github.com/remitamine/youtube-dl into remitamine... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=11bed5827dace09b5483b159476ce9f8c29d6078;hp=-c

Merge branch 'shahid' of https://github.com/remitamine/youtube-dl into remitamine-shahid
---

11bed5827dace09b5483b159476ce9f8c29d6078
diff --combined youtube_dl/extractor/__init__.py
index a8be63624,6c1d4f08a..7459a1944
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -19,14 -19,9 +19,14 @@@ from .anysex import AnySexI
  from .aol import AolIE
  from .allocine import AllocineIE
  from .aparat import AparatIE
 +from .appleconnect import AppleConnectIE
  from .appletrailers import AppleTrailersIE
  from .archiveorg import ArchiveOrgIE
 -from .ard import ARDIE, ARDMediathekIE
 +from .ard import (
 +    ARDIE,
 +    ARDMediathekIE,
 +    SportschauIE,
 +)
  from .arte import (
      ArteTvIE,
      ArteTVPlus7IE,
@@@ -43,10 -38,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
@@@ -118,7 -110,6 +118,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
@@@ -158,7 -149,6 +158,7 @@@ from .eporner import EpornerI
  from .eroprofile import EroProfileIE
  from .escapist import EscapistIE
  from .espn import ESPNIE
 +from .esri import EsriVideoIE
  from .everyonesmixtape import EveryonesMixtapeIE
  from .exfm import ExfmIE
  from .expotv import ExpoTVIE
@@@ -243,16 -233,11 +243,16 @@@ from .imdb import 
  )
  from .imgur import ImgurIE
  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
@@@ -285,7 -270,6 +285,7 @@@ from .kuwo import 
  )
  from .la7 import LA7IE
  from .laola1tv import Laola1TvIE
 +from .lecture2go import Lecture2GoIE
  from .letv import (
      LetvIE,
      LetvTvIE,
@@@ -437,10 -421,6 +437,10 @@@ from .orf import 
  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
@@@ -496,7 -476,6 +496,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,
@@@ -523,6 -502,7 +523,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
@@@ -602,7 -582,6 +603,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