[cleanup] Minor fixes (See desc)

[yt-dlp.git] / devscripts / make_lazy_extractors.py

diff --git a/devscripts/make_lazy_extractors.py b/devscripts/make_lazy_extractors.py
index 427045b98447692762a26d79b41fe9e86700c367..6dc8fed90aa2d9ac7cf3c96199f59a01631a9bbb 100644 (file)
--- a/devscripts/make_lazy_extractors.py
+++ b/devscripts/make_lazy_extractors.py
@@ -1,15 +1,11 @@
 #!/usr/bin/env python3
-from __future__ import unicode_literals, print_function
-
-from inspect import getsource
-import io
 import os
-from os.path import dirname as dirn
 import sys
+from inspect import getsource
 
-sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-lazy_extractors_filename = sys.argv[1]
+lazy_extractors_filename = sys.argv[1] if len(sys.argv) > 1 else 'yt_dlp/extractor/lazy_extractors.py'
 if os.path.exists(lazy_extractors_filename):
     os.remove(lazy_extractors_filename)
 
@@ -25,7 +21,7 @@
 if os.path.exists(plugins_blocked_dirname):
     os.rename(plugins_blocked_dirname, plugins_dirname)
 
-with open('devscripts/lazy_load_template.py', 'rt') as f:
+with open('devscripts/lazy_load_template.py', encoding='utf-8') as f:
     module_template = f.read()
 
 CLASS_PROPERTIES = ['ie_key', 'working', '_match_valid_url', 'suitable', '_match_id', 'get_temp_id']
@@ -39,12 +35,6 @@ class {name}({bases}):
     _module = '{module}'
 '''
 
-make_valid_template = '''
-    @classmethod
-    def _make_valid_url(cls):
-        return {valid_url!r}
-'''
-
 
 def get_base_name(base):
     if base is InfoExtractor:
@@ -61,15 +51,14 @@ def build_lazy_ie(ie, name):
         bases=', '.join(map(get_base_name, ie.__bases__)),
         module=ie.__module__)
     valid_url = getattr(ie, '_VALID_URL', None)
+    if not valid_url and hasattr(ie, '_make_valid_url'):
+        valid_url = ie._make_valid_url()
     if valid_url:
         s += f'    _VALID_URL = {valid_url!r}\n'
     if not ie._WORKING:
         s += '    _WORKING = False\n'
     if ie.suitable.__func__ is not InfoExtractor.suitable.__func__:
         s += f'\n{getsource(ie.suitable)}'
-    if hasattr(ie, '_make_valid_url'):
-        # search extractors
-        s += make_valid_template.format(valid_url=ie._make_valid_url())
     return s
 
 
@@ -79,7 +68,7 @@ def build_lazy_ie(ie, name):
 ordered_cls = []
 while classes:
     for c in classes[:]:
-        bases = set(c.__bases__) - set((object, InfoExtractor, SearchInfoExtractor))
+        bases = set(c.__bases__) - {object, InfoExtractor, SearchInfoExtractor}
         stop = False
         for b in bases:
             if b not in classes and b not in ordered_cls:
@@ -104,9 +93,9 @@ def build_lazy_ie(ie, name):
         names.append(name)
 
 module_contents.append(
-    '\n_ALL_CLASSES = [{0}]'.format(', '.join(names)))
+    '\n_ALL_CLASSES = [{}]'.format(', '.join(names)))
 
 module_src = '\n'.join(module_contents) + '\n'
 
-with io.open(lazy_extractors_filename, 'wt', encoding='utf-8') as f:
+with open(lazy_extractors_filename, 'wt', encoding='utf-8') as f:
     f.write(module_src)