diff options
| -rw-r--r-- | test/test_all_urls.py | 2 | ||||
| -rw-r--r-- | test/test_download.py | 6 | ||||
| -rw-r--r-- | test/test_write_info_json.py | 4 | ||||
| -rw-r--r-- | test/test_youtube_lists.py | 2 | ||||
| -rw-r--r-- | test/test_youtube_subtitles.py | 2 | ||||
| -rw-r--r-- | youtube_dl/FileDownloader.py | 2 | ||||
| -rwxr-xr-x | youtube_dl/InfoExtractors.py | 1 | ||||
| -rw-r--r-- | youtube_dl/__init__.py | 2 |
8 files changed, 11 insertions, 10 deletions
diff --git a/test/test_all_urls.py b/test/test_all_urls.py index dd67286a7..d3ee296be 100644 --- a/test/test_all_urls.py +++ b/test/test_all_urls.py @@ -7,7 +7,7 @@ import unittest import os sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dl.InfoExtractors import YoutubeIE, YoutubePlaylistIE, YoutubeChannelIE, JustinTVIE +from youtube_dl.extractor import YoutubeIE, YoutubePlaylistIE, YoutubeChannelIE, JustinTVIE class TestAllURLsMatching(unittest.TestCase): def test_youtube_playlist_matching(self): diff --git a/test/test_download.py b/test/test_download.py index 6365b0340..f3e56e9ae 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -14,7 +14,7 @@ import binascii sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) import youtube_dl.FileDownloader -import youtube_dl.InfoExtractors +import youtube_dl.extractors from youtube_dl.utils import * DEF_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'tests.json') @@ -72,7 +72,7 @@ class TestDownload(unittest.TestCase): def generator(test_case): def test_template(self): - ie = youtube_dl.InfoExtractors.get_info_extractor(test_case['name']) + ie = youtube_dl.extractors.get_info_extractor(test_case['name']) if not ie._WORKING: print('Skipping: IE marked as not _WORKING') return @@ -87,7 +87,7 @@ def generator(test_case): params.update(test_case.get('params', {})) fd = FileDownloader(params) - for ie in youtube_dl.InfoExtractors.gen_extractors(): + for ie in youtube_dl.extractors.gen_extractors(): fd.add_info_extractor(ie) finished_hook_called = set() def _hook(status): diff --git a/test/test_write_info_json.py b/test/test_write_info_json.py index 8134dda37..b5eca7649 100644 --- a/test/test_write_info_json.py +++ b/test/test_write_info_json.py @@ -10,7 +10,7 @@ import unittest sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) import youtube_dl.FileDownloader -import youtube_dl.InfoExtractors +import youtube_dl.extractor from youtube_dl.utils import * PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json") @@ -48,7 +48,7 @@ class TestInfoJSON(unittest.TestCase): self.tearDown() def test_info_json(self): - ie = youtube_dl.InfoExtractors.YoutubeIE() + ie = youtube_dl.extractor.YoutubeIE() fd = FileDownloader(params) fd.add_info_extractor(ie) fd.download([TEST_ID]) diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py index e8b49ff8e..2c46edfa6 100644 --- a/test/test_youtube_lists.py +++ b/test/test_youtube_lists.py @@ -8,7 +8,7 @@ import json import os sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dl.InfoExtractors import YoutubeUserIE, YoutubePlaylistIE, YoutubeIE, YoutubeChannelIE +from youtube_dl.extractor import YoutubeUserIE, YoutubePlaylistIE, YoutubeIE, YoutubeChannelIE from youtube_dl.utils import * from youtube_dl.FileDownloader import FileDownloader diff --git a/test/test_youtube_subtitles.py b/test/test_youtube_subtitles.py index c80c90cbe..129e23963 100644 --- a/test/test_youtube_subtitles.py +++ b/test/test_youtube_subtitles.py @@ -10,7 +10,7 @@ import hashlib import os sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from youtube_dl.InfoExtractors import YoutubeIE +from youtube_dl.extractor import YoutubeIE from youtube_dl.utils import * from youtube_dl import FileDownloader 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): |