Merge remote-tracking branch 'gitprojs/master'

[youtube-dl] / youtube_dl / extractor / __init__.py

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 7b291f907f79b37ab2a32d9cca6adb2aa4e51749..bffb6d115b15834a7bd88ed19e4e1a027a7888dd 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -1,11 +1,13 @@
 
 from .ard import ARDIE
 from .arte import ArteTvIE
 
 from .ard import ARDIE
 from .arte import ArteTvIE

+from .auengine import AuengineIE

 from .bandcamp import BandcampIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .breakcom import BreakIE
 from .bandcamp import BandcampIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .breakcom import BreakIE

-from .comedycentral import ComedyCentralIE

 from .collegehumor import CollegeHumorIE
 from .collegehumor import CollegeHumorIE

+from .comedycentral import ComedyCentralIE
+from .cspan import CSpanIE

 from .dailymotion import DailymotionIE
 from .depositfiles import DepositFilesIE
 from .eighttracks import EightTracksIE
 from .dailymotion import DailymotionIE
 from .depositfiles import DepositFilesIE
 from .eighttracks import EightTracksIE


@@ -17,12 +19,13 @@ from .gametrailers import GametrailersIE
 from .generic import GenericIE
 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .generic import GenericIE
 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE

+from .hotnewhiphop import HotNewHipHopIE

 from .howcast import HowcastIE
 from .hypem import HypemIE
 from .ina import InaIE
 from .infoq import InfoQIE
 from .howcast import HowcastIE
 from .hypem import HypemIE
 from .ina import InaIE
 from .infoq import InfoQIE

-from .justintv import JustinTVIE

 from .jukebox import JukeboxIE
 from .jukebox import JukeboxIE

+from .justintv import JustinTVIE

 from .keek import KeekIE
 from .liveleak import LiveLeakIE
 from .metacafe import MetacafeIE
 from .keek import KeekIE
 from .liveleak import LiveLeakIE
 from .metacafe import MetacafeIE


@@ -31,7 +34,6 @@ from .mtv import MTVIE
 from .myspass import MySpassIE
 from .myvideo import MyVideoIE
 from .nba import NBAIE
 from .myspass import MySpassIE
 from .myvideo import MyVideoIE
 from .nba import NBAIE

-from .statigram import StatigramIE

 from .photobucket import PhotobucketIE
 from .pornotube import PornotubeIE
 from .rbmaradio import RBMARadioIE
 from .photobucket import PhotobucketIE
 from .pornotube import PornotubeIE
 from .rbmaradio import RBMARadioIE


@@ -39,18 +41,21 @@ from .redtube import RedTubeIE
 from .soundcloud import SoundcloudIE, SoundcloudSetIE
 from .spiegel import SpiegelIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .soundcloud import SoundcloudIE, SoundcloudSetIE
 from .spiegel import SpiegelIE
 from .stanfordoc import StanfordOpenClassroomIE

+from .statigram import StatigramIE

 from .steam import SteamIE
 from .teamcoco import TeamcocoIE
 from .ted import TEDIE
 from .steam import SteamIE
 from .teamcoco import TeamcocoIE
 from .ted import TEDIE

+from .tudou import TudouIE

 from .tumblr import TumblrIE
 from .ustream import UstreamIE
 from .vbox7 import Vbox7IE
 from .vevo import VevoIE
 from .vimeo import VimeoIE
 from .vine import VineIE
 from .tumblr import TumblrIE
 from .ustream import UstreamIE
 from .vbox7 import Vbox7IE
 from .vevo import VevoIE
 from .vimeo import VimeoIE
 from .vine import VineIE

+from .wimp import WimpIE

 from .worldstarhiphop import WorldStarHipHopIE
 from .worldstarhiphop import WorldStarHipHopIE

-from .xnxx import XNXXIE

 from .xhamster import XHamsterIE
 from .xhamster import XHamsterIE

+from .xnxx import XNXXIE

 from .xvideos import XVideosIE
 from .yahoo import YahooIE, YahooSearchIE
 from .youjizz import YouJizzIE
 from .xvideos import XVideosIE
 from .yahoo import YahooIE, YahooSearchIE
 from .youjizz import YouJizzIE


@@ -59,6 +64,7 @@ from .youporn import YouPornIE
 from .youtube import YoutubeIE, YoutubePlaylistIE, YoutubeSearchIE, YoutubeUserIE, YoutubeChannelIE
 from .zdf import ZDFIE
 
 from .youtube import YoutubeIE, YoutubePlaylistIE, YoutubeSearchIE, YoutubeUserIE, YoutubeChannelIE
 from .zdf import ZDFIE
 

+

 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.
 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.


@@ -129,6 +135,11 @@ def gen_extractors():
         BreakIE(),
         VevoIE(),
         JukeboxIE(),
         BreakIE(),
         VevoIE(),
         JukeboxIE(),

+        TudouIE(),
+        CSpanIE(),
+        WimpIE(),
+        HotNewHipHopIE(),
+        AuengineIE(),

         GenericIE()
     ]
 
         GenericIE()
     ]