From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 10 Jan 2015 01:03:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'xavierbeynon/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=51897bb77c504ad206abbef5ae7504fcd082b5b0;hp=-c

Merge remote-tracking branch 'xavierbeynon/master'
---

51897bb77c504ad206abbef5ae7504fcd082b5b0
diff --combined youtube_dl/extractor/__init__.py
index 5da7568ca,e4c51f238..f544e87f1
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -26,7 -26,7 +26,7 @@@ from .arte import 
      ArteTVEmbedIE,
  )
  from .atresplayer import AtresPlayerIE
- from .audiomack import AudiomackIE
+ from .audiomack import AudiomackIE, AudiomackAlbumIE
  from .auengine import AUEngineIE
  from .azubu import AzubuIE
  from .bambuser import BambuserIE, BambuserChannelIE
@@@ -71,7 -71,6 +71,7 @@@ from .cnn import 
  from .collegehumor import CollegeHumorIE
  from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
  from .comcarcoff import ComCarCoffIE
 +from .commonmistakes import CommonMistakesIE
  from .condenast import CondeNastIE
  from .cracked import CrackedIE
  from .criterion import CriterionIE
@@@ -159,7 -158,6 +159,7 @@@ from .gametrailers import GametrailersI
  from .gdcvault import GDCVaultIE
  from .generic import GenericIE
  from .giantbomb import GiantBombIE
 +from .giga import GigaIE
  from .glide import GlideIE
  from .globo import GloboIE
  from .godtube import GodTubeIE
@@@ -274,7 -272,6 +274,7 @@@ from .nbc import 
  )
  from .ndr import NDRIE
  from .ndtv import NDTVIE
 +from .netzkino import NetzkinoIE
  from .nerdcubed import NerdCubedFeedIE
  from .newgrounds import NewgroundsIE
  from .newstube import NewstubeIE
@@@ -327,7 -324,6 +327,7 @@@ from .prosiebensat1 import ProSiebenSat
  from .pyvideo import PyvideoIE
  from .quickvid import QuickVidIE
  from .radiode import RadioDeIE
 +from .radiobremen import RadioBremenIE
  from .radiofrance import RadioFranceIE
  from .rai import RaiIE
  from .rbmaradio import RBMARadioIE
@@@ -348,7 -344,6 +348,7 @@@ from .ruhd import RUHDI
  from .rutube import (
      RutubeIE,
      RutubeChannelIE,
 +    RutubeEmbedIE,
      RutubeMovieIE,
      RutubePersonIE,
  )
@@@ -478,7 -473,6 +478,7 @@@ from .videott import VideoTtI
  from .videoweed import VideoWeedIE
  from .vidme import VidmeIE
  from .vidzi import VidziIE
 +from .vier import VierIE, VierVideosIE
  from .vimeo import (
      VimeoIE,
      VimeoAlbumIE,
@@@ -514,7 -508,6 +514,7 @@@ from .wdr import 
      WDRMobileIE,
      WDRMausIE,
  )
 +from .webofstories import WebOfStoriesIE
  from .weibo import WeiboIE
  from .wimp import WimpIE
  from .wistia import WistiaIE
@@@ -550,7 -543,7 +550,7 @@@ from .youtube import 
      YoutubeSearchURLIE,
      YoutubeShowIE,
      YoutubeSubscriptionsIE,
 -    YoutubeTopListIE,
 +    YoutubeTruncatedIDIE,
      YoutubeTruncatedURLIE,
      YoutubeUserIE,
      YoutubeWatchLaterIE,
@@@ -576,17 -569,6 +576,17 @@@ def gen_extractors()
      return [klass() for klass in _ALL_CLASSES]
  
  
 +def list_extractors(age_limit):
 +    """
 +    Return a list of extractors that are suitable for the given age,
 +    sorted by extractor ID.
 +    """
 +
 +    return sorted(
 +        filter(lambda ie: ie.is_suitable(age_limit), gen_extractors()),
 +        key=lambda ie: ie.IE_NAME.lower())
 +
 +
  def get_info_extractor(ie_name):
      """Returns the info extractor class with the given ie_name"""
      return globals()[ie_name + 'IE']