X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2F__init__.py;h=3bb573c166b15667b3829a0f3b054410cadbb9c6;hb=cc51a7d4e030646a5d7075934f11036ad52a3f1f;hp=a0caa21b02896d85e6cd6bae4ea9af448af943d5;hpb=59ae15a507cbf93de13f8fda8444d2d9a251747a;p=youtube-dl diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index a0caa21b0..3bb573c16 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -2,6 +2,7 @@ # -*- coding: utf-8 -*- from __future__ import with_statement +from __future__ import absolute_import __authors__ = ( 'Ricardo Garcia Gonzalez', @@ -22,7 +23,6 @@ __authors__ = ( ) __license__ = 'Public Domain' -__version__ = '2012.11.29' UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl' UPDATE_URL_VERSION = 'https://raw.github.com/rg3/youtube-dl/master/LATEST_VERSION' @@ -39,10 +39,11 @@ import subprocess import sys import warnings -from utils import * -from FileDownloader import * -from InfoExtractors import * -from PostProcessor import * +from .utils import * +from .version import __version__ +from .FileDownloader import * +from .InfoExtractors import * +from .PostProcessor import * def updateSelf(downloader, filename): ''' Update the program file with the latest version from the repository ''' @@ -422,7 +423,7 @@ def _real_main(): if opts.list_extractors: for ie in extractors: - print(ie.IE_NAME) + print(ie.IE_NAME + (' (CURRENTLY BROKEN)' if not ie._WORKING else '')) matchedUrls = filter(lambda url: ie.suitable(url), all_urls) all_urls = filter(lambda url: url not in matchedUrls, all_urls) for mu in matchedUrls: