Merge branch 'master' of https://github.com/rg3/youtube-dl

[youtube-dl] / youtube_dl / __init__.py

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 8068810ca19390b3f2e4ebc8bf54cb6fc9337165..1d914709fca158e37d7ff9795d7ac7a68871e81b 100644 (file)
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -21,6 +21,7 @@ __authors__  = (
     'Filippo Valsorda',
     'Christian Albrecht',
     'Dave Vasilevsky',
+    'Jaime Marquínez Ferrándiz',
     )
 
 __license__ = 'Public Domain'
@@ -40,7 +41,7 @@ from .utils import *
 from .update import update_self
 from .version import __version__
 from .FileDownloader import *
-from .InfoExtractors import *
+from .InfoExtractors import gen_extractors
 from .PostProcessor import *
 
 def parseOpts():
@@ -274,48 +275,6 @@ def parseOpts():
 
     return parser, opts, args
 
-def gen_extractors():
-    """ Return a list of an instance of every supported extractor.
-    The order does matter; the first extractor matched is the one handling the URL.
-    """
-    return [
-        YoutubePlaylistIE(),
-        YoutubeChannelIE(),
-        YoutubeUserIE(),
-        YoutubeSearchIE(),
-        YoutubeIE(),
-        MetacafeIE(),
-        DailymotionIE(),
-        GoogleSearchIE(),
-        PhotobucketIE(),
-        YahooIE(),
-        YahooSearchIE(),
-        DepositFilesIE(),
-        FacebookIE(),
-        BlipTVUserIE(),
-        BlipTVIE(),
-        VimeoIE(),
-        MyVideoIE(),
-        ComedyCentralIE(),
-        EscapistIE(),
-        CollegeHumorIE(),
-        XVideosIE(),
-        SoundcloudIE(),
-        InfoQIE(),
-        MixcloudIE(),
-        StanfordOpenClassroomIE(),
-        MTVIE(),
-        YoukuIE(),
-        XNXXIE(),
-        GooglePlusIE(),
-        ArteTvIE(),
-        NBAIE(),
-        JustinTVIE(),
-        FunnyOrDieIE(),
-        TweetReelIE(),
-        GenericIE()
-    ]
-
 def _real_main():
     parser, opts, args = parseOpts()