From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 7 Jun 2016 10:29:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'Boris-de/wdrmaus_fix#8562'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=4315f74fa8e97ca1fdd1fe919f777b3942da2028;hp=-c

Merge remote-tracking branch 'Boris-de/wdrmaus_fix#8562'
---

4315f74fa8e97ca1fdd1fe919f777b3942da2028
diff --combined youtube_dl/extractor/extractors.py
index ed4e39574,023598130..d107080f5
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@@ -3,10 -3,6 +3,10 @@@ from __future__ import unicode_literal
  
  from .abc import ABCIE
  from .abc7news import Abc7NewsIE
 +from .abcnews import (
 +    AbcNewsIE,
 +    AbcNewsVideoIE,
 +)
  from .academicearth import AcademicEarthCourseIE
  from .acast import (
      ACastIE,
@@@ -56,7 -52,6 +56,7 @@@ from .arte import 
      ArteTVDDCIE,
      ArteTVMagazineIE,
      ArteTVEmbedIE,
 +    ArteTVPlaylistIE,
  )
  from .atresplayer import AtresPlayerIE
  from .atttechchannel import ATTTechChannelIE
@@@ -80,7 -75,6 +80,7 @@@ from .bigflix import BigflixI
  from .bild import BildIE
  from .bilibili import BiliBiliIE
  from .biobiochiletv import BioBioChileTVIE
 +from .biqle import BIQLEIE
  from .bleacherreport import (
      BleacherReportIE,
      BleacherReportCMSIE,
@@@ -112,7 -106,6 +112,7 @@@ from .cbc import 
      CBCPlayerIE,
  )
  from .cbs import CBSIE
 +from .cbslocal import CBSLocalIE
  from .cbsinteractive import CBSInteractiveIE
  from .cbsnews import (
      CBSNewsIE,
@@@ -130,6 -123,7 +130,6 @@@ from .chirbit import 
      ChirbitProfileIE,
  )
  from .cinchcast import CinchcastIE
 -from .cinemassacre import CinemassacreIE
  from .cliprs import ClipRsIE
  from .clipfish import ClipfishIE
  from .cliphunter import CliphunterIE
@@@ -144,7 -138,7 +144,7 @@@ from .cnn import 
      CNNBlogsIE,
      CNNArticleIE,
  )
 -from .collegehumor import CollegeHumorIE
 +from .coub import CoubIE
  from .collegerama import CollegeRamaIE
  from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
  from .comcarcoff import ComCarCoffIE
@@@ -163,7 -157,6 +163,7 @@@ from .cspan import CSpanI
  from .ctsnews import CtsNewsIE
  from .cultureunplugged import CultureUnpluggedIE
  from .cwtv import CWTVIE
 +from .dailymail import DailyMailIE
  from .dailymotion import (
      DailymotionIE,
      DailymotionPlaylistIE,
@@@ -233,7 -226,6 +233,7 @@@ from .everyonesmixtape import Everyones
  from .exfm import ExfmIE
  from .expotv import ExpoTVIE
  from .extremetube import ExtremeTubeIE
 +from .eyedotv import EyedoTVIE
  from .facebook import FacebookIE
  from .faz import FazIE
  from .fc2 import FC2IE
@@@ -246,7 -238,6 +246,7 @@@ from .fktv import FKTVI
  from .flickr import FlickrIE
  from .folketinget import FolketingetIE
  from .footyroom import FootyRoomIE
 +from .formula1 import Formula1IE
  from .fourtube import FourTubeIE
  from .fox import FOXIE
  from .foxgay import FoxgayIE
@@@ -374,7 -365,6 +374,7 @@@ from .kuwo import 
  )
  from .la7 import LA7IE
  from .laola1tv import Laola1TvIE
 +from .learnr import LearnrIE
  from .lecture2go import Lecture2GoIE
  from .lemonde import LemondeIE
  from .leeco import (
@@@ -382,7 -372,6 +382,7 @@@
      LePlaylistIE,
      LetvCloudIE,
  )
 +from .libraryofcongress import LibraryOfCongressIE
  from .libsyn import LibsynIE
  from .lifenews import (
      LifeNewsIE,
@@@ -393,7 -382,6 +393,7 @@@ from .limelight import 
      LimelightChannelIE,
      LimelightChannelListIE,
  )
 +from .litv import LiTVIE
  from .liveleak import LiveLeakIE
  from .livestream import (
      LivestreamIE,
@@@ -401,7 -389,6 +401,7 @@@
      LivestreamShortenerIE,
  )
  from .lnkgo import LnkGoIE
 +from .localnews8 import LocalNews8IE
  from .lovehomeporn import LoveHomePornIE
  from .lrt import LRTIE
  from .lynda import (
@@@ -413,16 -400,13 +413,16 @@@ from .macgamestore import MacGameStoreI
  from .mailru import MailRuIE
  from .makerschannel import MakersChannelIE
  from .makertv import MakerTVIE
 -from .malemotion import MalemotionIE
  from .matchtv import MatchTVIE
  from .mdr import MDRIE
  from .metacafe import MetacafeIE
  from .metacritic import MetacriticIE
  from .mgoon import MgoonIE
  from .mgtv import MGTVIE
 +from .microsoftvirtualacademy import (
 +    MicrosoftVirtualAcademyIE,
 +    MicrosoftVirtualAcademyCourseIE,
 +)
  from .minhateca import MinhatecaIE
  from .ministrygrid import MinistryGridIE
  from .minoto import MinotoIE
@@@ -455,7 -439,8 +455,7 @@@ from .mtv import 
  )
  from .muenchentv import MuenchenTVIE
  from .musicplayon import MusicPlayOnIE
 -from .muzu import MuzuTVIE
 -from .mwave import MwaveIE
 +from .mwave import MwaveIE, MwaveMeetGreetIE
  from .myspace import MySpaceIE, MySpaceAlbumIE
  from .myspass import MySpassIE
  from .myvi import MyviIE
@@@ -577,10 -562,7 +577,10 @@@ from .parliamentliveuk import Parliamen
  from .patreon import PatreonIE
  from .pbs import PBSIE
  from .people import PeopleIE
 -from .periscope import PeriscopeIE
 +from .periscope import (
 +    PeriscopeIE,
 +    PeriscopeUserIE,
 +)
  from .philharmoniedeparis import PhilharmonieDeParisIE
  from .phoenix import PhoenixIE
  from .photobucket import PhotobucketIE
@@@ -621,10 -603,6 +621,10 @@@ from .qqmusic import 
      QQMusicPlaylistIE,
  )
  from .r7 import R7IE
 +from .radiocanada import (
 +    RadioCanadaIE,
 +    RadioCanadaAudioVideoIE,
 +)
  from .radiode import RadioDeIE
  from .radiojavan import RadioJavanIE
  from .radiobremen import RadioBremenIE
@@@ -638,12 -616,8 +638,12 @@@ from .rds import RDSI
  from .redtube import RedTubeIE
  from .regiotv import RegioTVIE
  from .restudy import RestudyIE
 +from .reuters import ReutersIE
  from .reverbnation import ReverbNationIE
 -from .revision3 import Revision3IE
 +from .revision3 import (
 +    Revision3EmbedIE,
 +    Revision3IE,
 +)
  from .rice import RICEIE
  from .ringtv import RingTVIE
  from .ro220 import Ro220IE
@@@ -682,11 -656,10 +682,11 @@@ from .screencast import ScreencastI
  from .screencastomatic import ScreencastOMaticIE
  from .screenjunkies import ScreenJunkiesIE
  from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE
 +from .seeker import SeekerIE
  from .senateisvp import SenateISVPIE
 +from .sendtonews import SendtoNewsIE
  from .servingsys import ServingSysIE
  from .sexu import SexuIE
 -from .sexykarma import SexyKarmaIE
  from .shahid import ShahidIE
  from .shared import SharedIE
  from .sharesix import ShareSixIE
@@@ -703,6 -676,10 +703,6 @@@ from .smotri import 
      SmotriUserIE,
      SmotriBroadcastIE,
  )
 -from .snagfilms import (
 -    SnagFilmsIE,
 -    SnagFilmsEmbedIE,
 -)
  from .snotr import SnotrIE
  from .sohu import SohuIE
  from .soundcloud import (
@@@ -754,10 -731,7 +754,10 @@@ from .svt import 
  from .swrmediathek import SWRMediathekIE
  from .syfy import SyfyIE
  from .sztvhu import SztvHuIE
 -from .tagesschau import TagesschauIE
 +from .tagesschau import (
 +    TagesschauPlayerIE,
 +    TagesschauIE,
 +)
  from .tapely import TapelyIE
  from .tass import TassIE
  from .tdslifeway import TDSLifewayIE
@@@ -787,7 -761,6 +787,7 @@@ from .thesixtyone import TheSixtyOneI
  from .thestar import TheStarIE
  from .thisamericanlife import ThisAmericanLifeIE
  from .thisav import ThisAVIE
 +from .threeqsdn import ThreeQSDNIE
  from .tinypic import TinyPicIE
  from .tlc import TlcDeIE
  from .tmz import (
@@@ -840,10 -813,7 +840,10 @@@ from .tvc import 
  )
  from .tvigle import TvigleIE
  from .tvland import TVLandIE
 -from .tvp import TvpIE, TvpSeriesIE
 +from .tvp import (
 +    TVPIE,
 +    TVPSeriesIE,
 +)
  from .tvplay import TVPlayIE
  from .tweakers import TweakersIE
  from .twentyfourvideo import TwentyFourVideoIE
@@@ -858,6 -828,7 +858,6 @@@ from .twitch import 
      TwitchVodIE,
      TwitchProfileIE,
      TwitchPastBroadcastsIE,
 -    TwitchBookmarksIE,
      TwitchStreamIE,
  )
  from .twitter import (
@@@ -875,20 -846,14 +875,20 @@@ from .unistra import UnistraI
  from .urort import UrortIE
  from .usatoday import USATodayIE
  from .ustream import UstreamIE, UstreamChannelIE
 -from .ustudio import UstudioIE
 +from .ustudio import (
 +    UstudioIE,
 +    UstudioEmbedIE,
 +)
  from .varzesh3 import Varzesh3IE
  from .vbox7 import Vbox7IE
  from .veehd import VeeHDIE
  from .veoh import VeohIE
  from .vessel import VesselIE
  from .vesti import VestiIE
 -from .vevo import VevoIE
 +from .vevo import (
 +    VevoIE,
 +    VevoPlaylistIE,
 +)
  from .vgtv import (
      BTArticleIE,
      BTVestlendingenIE,
@@@ -910,7 -875,6 +910,7 @@@ from .videomore import 
  )
  from .videopremium import VideoPremiumIE
  from .videott import VideoTtIE
 +from .vidio import VidioIE
  from .vidme import (
      VidmeIE,
      VidmeUserIE,
@@@ -918,10 -882,6 +918,10 @@@
  )
  from .vidzi import VidziIE
  from .vier import VierIE, VierVideosIE
 +from .viewlift import (
 +    ViewLiftIE,
 +    ViewLiftEmbedIE,
 +)
  from .viewster import ViewsterIE
  from .viidea import ViideaIE
  from .vimeo import (
@@@ -958,16 -918,11 +958,15 @@@ from .vube import VubeI
  from .vuclip import VuClipIE
  from .vulture import VultureIE
  from .walla import WallaIE
 -from .washingtonpost import WashingtonPostIE
 +from .washingtonpost import (
 +    WashingtonPostIE,
 +    WashingtonPostArticleIE,
 +)
  from .wat import WatIE
 +from .watchindianporn import WatchIndianPornIE
  from .wdr import (
      WDRIE,
      WDRMobileIE,
-     WDRMausIE,
  )
  from .webofstories import (
      WebOfStoriesIE,
@@@ -987,12 -942,6 +986,12 @@@ from .xhamster import 
      XHamsterIE,
      XHamsterEmbedIE,
  )
 +from .xiami import (
 +    XiamiSongIE,
 +    XiamiAlbumIE,
 +    XiamiArtistIE,
 +    XiamiCollectionIE
 +)
  from .xminus import XMinusIE
  from .xnxx import XNXXIE
  from .xstream import XstreamIE