fz0x1/HPI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core/source: use import error (#211)

Browse source 
core/source: use import error

uses the more broad ImportError
instead of ModuleNotFoundError

reasoning being if some submodule
(the one I'm configuring currently is
my.twitter.twint) doesn't have additional
imports from another parser/DAL, but it
still has a config block, the user would
have to create a stub-config block in their
config to use the all.py file
This commit is contained in:
seanbreckenridge 2022-02-10 00:57:52 -08:00 • committed by GitHub
parent bea2c6a201
commit 7bf316eb9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
my/core/source.py
View file

@ -4,7 +4,7 @@ and yielding nothing (or a default) when its not available
"""
from typing import Any, Iterator, TypeVar, Callable, Optional, Iterable, Any
from my.core.warnings import warn
from my.core.warnings import medium, warn
from functools import wraps
# The factory function may produce something that has data
@ -43,20 +43,26 @@ def import_source(
try:
res = factory_func(**kwargs)
yield from res
except ModuleNotFoundError:
except ImportError as err:
from . import core_config as CC
from .error import warn_my_config_import_error
suppressed_in_conf = False
if module_name is not None and CC.config._is_module_active(module_name) is False:
suppressed_in_conf = True
if not suppressed_in_conf:
if module_name is None:
warn(f"Module {factory_func.__qualname__} could not be imported, or isn't configured properly")
medium(f"Module {factory_func.__qualname__} could not be imported, or isn't configured properly")
else:
warn(f"""Module {module_name} ({factory_func.__qualname__}) could not be imported, or isn't configured properly\nTo hide this message, add {module_name} to your core config disabled_classes, like:
medium(f"Module {module_name} ({factory_func.__qualname__}) could not be imported, or isn't configured properly")
warn(f"""To hide this message, add {module_name} to your core config disabled_classes, like:
class core:
disabled_modules = [{repr(module_name)}]
""")
# explicitly check if this is a ImportError, and didn't fail
# due to a module not being installed
if type(err) == ImportError:
warn_my_config_import_error(err)
yield from default
return wrapper
return decorator