Fix imports and restrict available legacy imports

pull/924/head
Philipp Hagemeister 2013-06-23 22:38:59 +02:00
parent f9c6cbf002
commit c59b4aaeef
2 changed files with 58 additions and 57 deletions

View File

@ -1,3 +1,3 @@
from .extractor.common import InfoExtractor, SearchInfoExtractor from .extractor.common import InfoExtractor, SearchInfoExtractor
from .extractor import * from .extractor import gen_extractors, get_info_extractor

View File

@ -1,59 +1,60 @@
from .extractor.ard import ARDIE
from .extractor.arte import ArteTvIE from .ard import ARDIE
from .extractor.bandcamp import BandcampIE from .arte import ArteTvIE
from .extractor.bliptv import BlipTVIE, BlipTVUserIE from .bandcamp import BandcampIE
from .extractor.comedycentral import ComedyCentralIE from .bliptv import BlipTVIE, BlipTVUserIE
from .extractor.collegehumor import CollegeHumorIE from .comedycentral import ComedyCentralIE
from .extractor.dailymotion import DailymotionIE from .collegehumor import CollegeHumorIE
from .extractor.depositfiles import DepositFilesIE from .dailymotion import DailymotionIE
from .extractor.eighttracks import EightTracksIE from .depositfiles import DepositFilesIE
from .extractor.escapist import EscapistIE from .eighttracks import EightTracksIE
from .extractor.facebook import FacebookIE from .escapist import EscapistIE
from .extractor.flickr import FlickrIE from .facebook import FacebookIE
from .extractor.funnyordie import FunnyOrDieIE from .flickr import FlickrIE
from .extractor.gametrailers import GametrailersIE from .funnyordie import FunnyOrDieIE
from .extractor.generic import GenericIE from .gametrailers import GametrailersIE
from .extractor.googleplus import GooglePlusIE from .generic import GenericIE
from .extractor.googlesearch import GoogleSearchIE from .googleplus import GooglePlusIE
from .extractor.howcast import HowcastIE from .googlesearch import GoogleSearchIE
from .extractor.hypem import HypemIE from .howcast import HowcastIE
from .extractor.ina import InaIE from .hypem import HypemIE
from .extractor.infoq import InfoQIE from .ina import InaIE
from .extractor.justintv import JustinTVIE from .infoq import InfoQIE
from .extractor.keek import KeekIE from .justintv import JustinTVIE
from .extractor.liveleak import LiveLeakIE from .keek import KeekIE
from .extractor.metacafe import MetacafeIE from .liveleak import LiveLeakIE
from .extractor.mixcloud import MixcloudIE from .metacafe import MetacafeIE
from .extractor.mtv import MTVIE from .mixcloud import MixcloudIE
from .extractor.myspass import MySpassIE from .mtv import MTVIE
from .extractor.myvideo import MyVideoIE from .myspass import MySpassIE
from .extractor.nba import NBAIE from .myvideo import MyVideoIE
from .extractor.statigram import StatigramIE from .nba import NBAIE
from .extractor.photobucket import PhotobucketIE from .statigram import StatigramIE
from .extractor.pornotube import PornotubeIE from .photobucket import PhotobucketIE
from .extractor.rbmaradio import RBMARadioIE from .pornotube import PornotubeIE
from .extractor.redtube import RedTubeIE from .rbmaradio import RBMARadioIE
from .extractor.soundcloud import SoundcloudIE, SoundcloudSetIE from .redtube import RedTubeIE
from .extractor.spiegel import SpiegelIE from .soundcloud import SoundcloudIE, SoundcloudSetIE
from .extractor.stanfordoc import StanfordOpenClassroomIE from .spiegel import SpiegelIE
from .extractor.steam import SteamIE from .stanfordoc import StanfordOpenClassroomIE
from .extractor.teamcoco import TeamcocoIE from .steam import SteamIE
from .extractor.ted import TEDIE from .teamcoco import TeamcocoIE
from .extractor.tumblr import TumblrIE from .ted import TEDIE
from .extractor.ustream import UstreamIE from .tumblr import TumblrIE
from .extractor.vbox7 import Vbox7IE from .ustream import UstreamIE
from .extractor.vimeo import VimeoIE from .vbox7 import Vbox7IE
from .extractor.vine import VineIE from .vimeo import VimeoIE
from .extractor.worldstarhiphop import WorldStarHipHopIE from .vine import VineIE
from .extractor.xnxx import XNXXIE from .worldstarhiphop import WorldStarHipHopIE
from .extractor.xhamster import XHamsterIE from .xnxx import XNXXIE
from .extractor.xvideos import XVideosIE from .xhamster import XHamsterIE
from .extractor.yahoo import YahooIE, YahooSearchIE from .xvideos import XVideosIE
from .extractor.youjizz import YouJizzIE from .yahoo import YahooIE, YahooSearchIE
from .extractor.youku import YoukuIE from .youjizz import YouJizzIE
from .extractor.youporn import YouPornIE from .youku import YoukuIE
from .extractor.youtube import YoutubeIE, YoutubePlaylistIE, YoutubeSearchIE, YoutubeUserIE, YoutubeChannelIE from .youporn import YouPornIE
from .extractor.zdf import ZDFIE from .youtube import YoutubeIE, YoutubePlaylistIE, YoutubeSearchIE, YoutubeUserIE, YoutubeChannelIE
from .zdf import ZDFIE
def gen_extractors(): def gen_extractors():
""" Return a list of an instance of every supported extractor. """ Return a list of an instance of every supported extractor.