aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/__init__.py
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2012-03-30 23:45:27 +0200
committerFilippo Valsorda <filippo.valsorda@gmail.com>2012-03-30 23:45:27 +0200
commit58ca755f4062146fbb9ce9d4383f033b8a631ed0 (patch)
tree8b86b7e7369730cb24eaae8f49fcf357d2603c9d /youtube_dl/__init__.py
parent770234afa28d39f8ca512a3908d589b67af71020 (diff)
downloadyoutube-dl-58ca755f4062146fbb9ce9d4383f033b8a631ed0.tar.xz
moved increment_downloads and process_info calls from IEs to FD.download (#296) (follows current doclines); a small step towards importability #217
Diffstat (limited to 'youtube_dl/__init__.py')
-rw-r--r--youtube_dl/__init__.py21
1 files changed, 9 insertions, 12 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 409e4386f..6d2b0ce85 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -291,21 +291,18 @@ 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.
"""
- youtube_ie = YoutubeIE()
- google_ie = GoogleIE()
- yahoo_ie = YahooIE()
return [
- YoutubePlaylistIE(youtube_ie),
- YoutubeUserIE(youtube_ie),
- YoutubeSearchIE(youtube_ie),
- youtube_ie,
- MetacafeIE(youtube_ie),
+ YoutubePlaylistIE(),
+ YoutubeUserIE(),
+ YoutubeSearchIE(),
+ YoutubeIE(),
+ MetacafeIE(),
DailymotionIE(),
- google_ie,
- GoogleSearchIE(google_ie),
+ GoogleIE(),
+ GoogleSearchIE(),
PhotobucketIE(),
- yahoo_ie,
- YahooSearchIE(yahoo_ie),
+ YahooIE(),
+ YahooSearchIE(),
DepositFilesIE(),
FacebookIE(),
BlipTVIE(),