diff options
| -rwxr-xr-x | youtube_dl/YoutubeDL.py | 4 | ||||
| -rw-r--r-- | youtube_dl/extractor/__init__.py | 2 | 
2 files changed, 5 insertions, 1 deletions
| diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index f18a8e840..a89a71a25 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -82,7 +82,7 @@ from .utils import (      YoutubeDLHandler,  )  from .cache import Cache -from .extractor import get_info_extractor, gen_extractor_classes +from .extractor import get_info_extractor, gen_extractor_classes, _LAZY_LOADER  from .downloader import get_suitable_downloader  from .downloader.rtmp import rtmpdump_version  from .postprocessor import ( @@ -1959,6 +1959,8 @@ class YoutubeDL(object):          write_string(encoding_str, encoding=None)          self._write_string('[debug] youtube-dl version ' + __version__ + '\n') +        if _LAZY_LOADER: +            self._write_string('[debug] Lazy loading extractors enabled' + '\n')          try:              sp = subprocess.Popen(                  ['git', 'rev-parse', '--short', 'HEAD'], diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index b0d4d156b..18d8dbcd6 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -3,7 +3,9 @@ from __future__ import unicode_literals  try:      from .lazy_extractors import *      from .lazy_extractors import _ALL_CLASSES +    _LAZY_LOADER = True  except ImportError: +    _LAZY_LOADER = False      from .extractors import *      _ALL_CLASSES = [ | 
