Merge remote-tracking branch 'Rudloff/websurg'

diff --combined youtube_dl/extractor/__init__.py
index 14ba6f35815c4b3cad6fd33bacff9ae1b997284a,19ded18f102d50027ae495f0d29aef7cfcc974e9..5f0e2ec9be9f310f876597c96c3f4944d68d2023
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -2,12 -2,7 +2,12 @@@ from .appletrailers import AppleTrailer
  from .addanime import AddAnimeIE
  from .archiveorg import ArchiveOrgIE
  from .ard import ARDIE
 -from .arte import ArteTvIE
 +from .arte import (
 +    ArteTvIE,
 +    ArteTVPlus7IE,
 +    ArteTVCreativeIE,
 +    ArteTVFutureIE,
 +)
  from .auengine import AUEngineIE
  from .bandcamp import BandcampIE
  from .bliptv import BlipTVIE, BlipTVUserIE
@@@ -17,40 -12,27 +17,40 @@@ from .brightcove import BrightcoveI
  from .c56 import C56IE
  from .canalplus import CanalplusIE
  from .canalc2 import Canalc2IE
 +from .cinemassacre import CinemassacreIE
  from .cnn import CNNIE
  from .collegehumor import CollegeHumorIE
  from .comedycentral import ComedyCentralIE
  from .condenast import CondeNastIE
  from .criterion import CriterionIE
  from .cspan import CSpanIE
 -from .dailymotion import DailymotionIE, DailymotionPlaylistIE
 +from .dailymotion import (
 +    DailymotionIE,
 +    DailymotionPlaylistIE,
 +    DailymotionUserIE,
 +)
  from .daum import DaumIE
  from .depositfiles import DepositFilesIE
  from .dotsub import DotsubIE
  from .dreisat import DreiSatIE
  from .defense import DefenseGouvFrIE
 +from .ebaumsworld import EbaumsWorldIE
  from .ehow import EHowIE
  from .eighttracks import EightTracksIE
  from .escapist import EscapistIE
  from .exfm import ExfmIE
  from .facebook import FacebookIE
 +from .faz import FazIE
 +from .fktv import (
 +    FKTVIE,
 +    FKTVPosteckeIE,
 +)
  from .flickr import FlickrIE
  from .francetv import (
      PluzzIE,
      FranceTvInfoIE,
 +    France2IE,
 +    GenerationQuoiIE
  )
  from .freesound import FreesoundIE
  from .funnyordie import FunnyOrDieIE
@@@ -67,7 -49,6 +67,7 @@@ from .ign import IGNIE, OneUPI
  from .ina import InaIE
  from .infoq import InfoQIE
  from .instagram import InstagramIE
 +from .internetvideoarchive import InternetVideoArchiveIE
  from .jeuxvideo import JeuxVideoIE
  from .jukebox import JukeboxIE
  from .justintv import JustinTVIE
@@@ -87,9 -68,6 +87,9 @@@ from .myvideo import MyVideoI
  from .naver import NaverIE
  from .nba import NBAIE
  from .nbc import NBCNewsIE
 +from .newgrounds import NewgroundsIE
 +from .nhl import NHLIE, NHLVideocenterIE
 +from .nowvideo import NowVideoIE
  from .ooyala import OoyalaIE
  from .orf import ORFIE
  from .pbs import PBSIE
@@@ -99,7 -77,6 +99,7 @@@ from .rbmaradio import RBMARadioI
  from .redtube import RedTubeIE
  from .ringtv import RingTVIE
  from .ro220 import Ro220IE
 +from .rottentomatoes import RottenTomatoesIE
  from .roxwel import RoxwelIE
  from .rtlnow import RTLnowIE
  from .sina import SinaIE
@@@ -112,7 -89,6 +112,7 @@@ from .spiegel import SpiegelI
  from .stanfordoc import StanfordOpenClassroomIE
  from .statigram import StatigramIE
  from .steam import SteamIE
 +from .sztvhu import SztvHuIE
  from .teamcoco import TeamcocoIE
  from .ted import TEDIE
  from .tf1 import TF1IE
@@@ -129,13 -105,11 +129,14 @@@ from .veehd import VeeHDI
  from .veoh import VeohIE
  from .vevo import VevoIE
  from .vice import ViceIE
 +from .viddler import ViddlerIE
 +from .videodetective import VideoDetectiveIE
  from .videofyme import VideofyMeIE
 +from .videopremium import VideoPremiumIE
  from .vimeo import VimeoIE, VimeoChannelIE
  from .vine import VineIE
  from .wat import WatIE
+ from .websurg import WeBSurgIE
  from .weibo import WeiboIE
  from .wimp import WimpIE
  from .worldstarhiphop import WorldStarHipHopIE
@@@ -155,7 -129,6 +156,7 @@@ from .youtube import 
      YoutubeShowIE,
      YoutubeSubscriptionsIE,
      YoutubeRecommendedIE,
 +    YoutubeTruncatedURLIE,
      YoutubeWatchLaterIE,
      YoutubeFavouritesIE,
  )