xZero707/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-27 06:10:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

[compat_utils] Simplify EnhancedModule

Browse Source
This commit is contained in:
pukkandan 2023-02-09 01:34:39 +05:30
parent acb1042a9f
commit 768a001781
No known key found for this signature in database
GPG Key ID: 7EEE9E1E817D0A39
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
yt_dlp/compat/compat_utils.py
View File

@ -28,20 +28,6 @@ def _is_dunder(name):
class EnhancedModule(types.ModuleType): class EnhancedModule(types.ModuleType):
def __new__(cls, name, *args, **kwargs):
if name not in sys.modules:
return super().__new__(cls, name, *args, **kwargs)
assert not args and not kwargs, 'Cannot pass additional arguments to an existing module'
module = sys.modules[name]
module.__class__ = cls
return module
def __init__(self, name, *args, **kwargs):
# Prevent __new__ from trigerring __init__ again
if name not in sys.modules:
super().__init__(name, *args, **kwargs)
def __bool__(self): def __bool__(self):
return vars(self).get('__bool__', lambda: True)() return vars(self).get('__bool__', lambda: True)()
@ -60,8 +46,6 @@ def __getattribute__(self, attr):
def passthrough_module(parent, child, allowed_attributes=(..., ), *, callback=lambda _: None): def passthrough_module(parent, child, allowed_attributes=(..., ), *, callback=lambda _: None):
"""Passthrough parent module into a child module, creating the parent if necessary""" """Passthrough parent module into a child module, creating the parent if necessary"""
parent = EnhancedModule(parent)
def __getattr__(attr): def __getattr__(attr):
if _is_package(parent): if _is_package(parent):
with contextlib.suppress(ImportError): with contextlib.suppress(ImportError):
@ -93,5 +77,7 @@ def from_child(attr):
return _NO_ATTRIBUTE return _NO_ATTRIBUTE
parent = sys.modules.get(parent, types.ModuleType(parent))
parent.__class__ = EnhancedModule
parent.__getattr__ = __getattr__ parent.__getattr__ = __getattr__
return parent return parent

8
yt_dlp/dependencies/Cryptodome.py
View File

@ -1,5 +1,7 @@
import types
from ..compat import functools from ..compat import functools
from ..compat.compat_utils import EnhancedModule, passthrough_module from ..compat.compat_utils import passthrough_module
try: try:
import Cryptodome as _parent import Cryptodome as _parent
@ -7,11 +9,11 @@
try: try:
import Crypto as _parent import Crypto as _parent
except (ImportError, SyntaxError): # Old Crypto gives SyntaxError in newer Python except (ImportError, SyntaxError): # Old Crypto gives SyntaxError in newer Python
_parent = EnhancedModule('Cryptodome') _parent = types.ModuleType('no_Cryptodome')
__bool__ = lambda: False __bool__ = lambda: False
passthrough_module(__name__, _parent, (..., '__version__')) passthrough_module(__name__, _parent, (..., '__version__'))
del passthrough_module, EnhancedModule del passthrough_module
@property @property