l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[modules] Separate modules into core & contrib

Browse source 
Also, improve errors when importing a module fails.

Also, add more tests.
This commit is contained in:
Tobias Witek 2020-03-06 14:14:34 +01:00
parent 47950240d0
commit efc2e4f94e
15 changed files with 38 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
core/module.py
View file

@ -8,12 +8,19 @@ import core.decorators
log = logging.getLogger(__name__)
def load(module_name, config=None):
try:
mod = importlib.import_module('modules.{}'.format(module_name))
except ImportError as error:
log.fatal('failed to import {}: {}'.format(module_name, error))
return Error(config, module_name, error)
return getattr(mod, 'Module')(config)
error = None
for namespace in [ 'core', 'contrib' ]:
try:
mod = importlib.import_module('modules.{}.{}'.format(namespace, module_name))
return getattr(mod, 'Module')(config)
except ModuleNotFoundError as e:
pass
except ImportError as e:
error = str(e)
if not error:
error = 'No such module'
log.fatal('failed to import {}: {}'.format(module_name, error))
return Error(config, module_name, error)
class Module(core.input.Object):
def __init__(self, config=None, widgets=[]):