aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-06-23 22:42:59 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-06-23 22:42:59 +0200
commit0824c28c8bb8390cd750c3bf95c6307c8462dcc1 (patch)
tree17651cf485db8621e9377863c311c631e6adb6a8 /youtube_dl
parentc59b4aaeef04cba1c98cbc9934fd6bc8d8ba416c (diff)
downloadyoutube-dl-0824c28c8bb8390cd750c3bf95c6307c8462dcc1.tar.xz
Remove mentions of old InfoExtractors module
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/FileDownloader.py2
-rwxr-xr-xyoutube_dl/InfoExtractors.py1
-rw-r--r--youtube_dl/__init__.py2
3 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index b3a07617c..f21c66c29 100644
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -13,7 +13,7 @@ if os.name == 'nt':
import ctypes
from .utils import *
-from .InfoExtractors import get_info_extractor
+from .extractor import get_info_extractor
class FileDownloader(object):
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index a176344d7..672ef9eed 100755
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -1,3 +1,4 @@
+# Legacy file for backwards compatibility, use youtube_dl.extractor instead!
from .extractor.common import InfoExtractor, SearchInfoExtractor
from .extractor import gen_extractors, get_info_extractor
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index e1d0eecc3..a8b62a6cd 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -45,7 +45,7 @@ from .utils import *
from .update import update_self
from .version import __version__
from .FileDownloader import *
-from .InfoExtractors import gen_extractors
+from .extractor import gen_extractors
from .PostProcessor import *
def parseOpts(overrideArguments=None):