From 768a00178109508893488e53a0e720b117fbccf6 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Thu, 9 Feb 2023 01:34:39 +0530 Subject: [PATCH] [compat_utils] Simplify `EnhancedModule` --- yt_dlp/compat/compat_utils.py | 18 ++---------------- yt_dlp/dependencies/Cryptodome.py | 8 +++++--- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/yt_dlp/compat/compat_utils.py b/yt_dlp/compat/compat_utils.py index f8679c98e..8956b3bf1 100644 --- a/yt_dlp/compat/compat_utils.py +++ b/yt_dlp/compat/compat_utils.py @@ -28,20 +28,6 @@ def _is_dunder(name): 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): 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): """Passthrough parent module into a child module, creating the parent if necessary""" - parent = EnhancedModule(parent) - def __getattr__(attr): if _is_package(parent): with contextlib.suppress(ImportError): @@ -93,5 +77,7 @@ def from_child(attr): return _NO_ATTRIBUTE + parent = sys.modules.get(parent, types.ModuleType(parent)) + parent.__class__ = EnhancedModule parent.__getattr__ = __getattr__ return parent diff --git a/yt_dlp/dependencies/Cryptodome.py b/yt_dlp/dependencies/Cryptodome.py index 580ce0753..2adc51374 100644 --- a/yt_dlp/dependencies/Cryptodome.py +++ b/yt_dlp/dependencies/Cryptodome.py @@ -1,5 +1,7 @@ +import types + from ..compat import functools -from ..compat.compat_utils import EnhancedModule, passthrough_module +from ..compat.compat_utils import passthrough_module try: import Cryptodome as _parent @@ -7,11 +9,11 @@ try: import Crypto as _parent except (ImportError, SyntaxError): # Old Crypto gives SyntaxError in newer Python - _parent = EnhancedModule('Cryptodome') + _parent = types.ModuleType('no_Cryptodome') __bool__ = lambda: False passthrough_module(__name__, _parent, (..., '__version__')) -del passthrough_module, EnhancedModule +del passthrough_module @property