From e5458d1d88fcc81011ab19ba610c4b37946c9fa9 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Wed, 24 Aug 2022 15:10:21 +0530 Subject: Fix lazy extractor bug in fe7866d0ed6bfa3904ce12b049a3424fdc0ea1fa and add test Fixes https://github.com/yt-dlp/yt-dlp/pull/3234#issuecomment-1225347071 --- devscripts/lazy_load_template.py | 11 +++++++---- devscripts/make_lazy_extractors.py | 4 +++- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'devscripts') diff --git a/devscripts/lazy_load_template.py b/devscripts/lazy_load_template.py index a6e26b6f6..626b85d62 100644 --- a/devscripts/lazy_load_template.py +++ b/devscripts/lazy_load_template.py @@ -11,14 +11,17 @@ from ..utils import ( # These bloat the lazy_extractors, so allow them to passthrough silently ALLOWED_CLASSMETHODS = {'get_testcases', 'extract_from_webpage'} +_WARNED = False class LazyLoadMetaClass(type): def __getattr__(cls, name): - if '_real_class' not in cls.__dict__ and name not in ALLOWED_CLASSMETHODS: - write_string( - 'WARNING: Falling back to normal extractor since lazy extractor ' - f'{cls.__name__} does not have attribute {name}{bug_reports_message()}\n') + global _WARNED + if ('_real_class' not in cls.__dict__ + and name not in ALLOWED_CLASSMETHODS and not _WARNED): + _WARNED = True + write_string('WARNING: Falling back to normal extractor since lazy extractor ' + f'{cls.__name__} does not have attribute {name}{bug_reports_message()}\n') return getattr(cls.real_class, name) diff --git a/devscripts/make_lazy_extractors.py b/devscripts/make_lazy_extractors.py index 01bd88ae6..43885331f 100644 --- a/devscripts/make_lazy_extractors.py +++ b/devscripts/make_lazy_extractors.py @@ -12,7 +12,9 @@ from inspect import getsource from devscripts.utils import get_filename_args, read_file, write_file NO_ATTR = object() -STATIC_CLASS_PROPERTIES = ['IE_NAME', 'IE_DESC', 'SEARCH_KEY', '_VALID_URL', '_WORKING', '_NETRC_MACHINE', 'age_limit'] +STATIC_CLASS_PROPERTIES = [ + 'IE_NAME', 'IE_DESC', 'SEARCH_KEY', '_VALID_URL', '_WORKING', '_ENABLED', '_NETRC_MACHINE', 'age_limit' +] CLASS_METHODS = [ 'ie_key', 'working', 'description', 'suitable', '_match_valid_url', '_match_id', 'get_temp_id', 'is_suitable' ] -- cgit v1.2.3