diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ModuleManager.py | 16 | ||||
| -rw-r--r-- | src/utils/decorators.py | 11 |
2 files changed, 14 insertions, 13 deletions
diff --git a/src/ModuleManager.py b/src/ModuleManager.py index b8dcd107..a43181fe 100644 --- a/src/ModuleManager.py +++ b/src/ModuleManager.py @@ -256,7 +256,13 @@ class ModuleManager(object): module_title = (getattr(module_object, "_name", None) or definition.name.title()) - # @utils.hook() magic + # per-module @export magic + if utils.decorators.has_magic(module_object): + magic = utils.decorators.get_magic(module_object) + for key, value in magic.get_exports(): + context_exports.add(key, value) + + # per-function @hook/@export magic for attribute_name in dir(module_object): attribute = getattr(module_object, attribute_name) if (inspect.ismethod(attribute) and @@ -265,12 +271,8 @@ class ModuleManager(object): for hook, kwargs in magic.get_hooks(): context_events.on(hook)._hook(attribute, kwargs=kwargs) - - # @utils.export() magic - if utils.decorators.has_magic(module_object): - magic = utils.decorators.get_magic(module_object) - for key, value in magic.get_exports(): - context_exports.add(key, value) + for key, value in magic.get_exports(): + context_exports.add(key, attribute) branch, commit = utils.git_commit(bot.directory) diff --git a/src/utils/decorators.py b/src/utils/decorators.py index ca47ea6e..855d2b2e 100644 --- a/src/utils/decorators.py +++ b/src/utils/decorators.py @@ -37,12 +37,11 @@ def hook(event: str, **kwargs): magic.add_hook(event, kwargs) return func return _hook_func -def export(setting: str, value: typing.Any): - def _export_func(module): - magic = get_magic(module) - magic.add_export(setting, value) - return module - return _export_func +def export(setting: str, value: typing.Any=None): + def _export(obj: typing.Any): + get_magic(obj).add_export(setting, value) + return obj + return _export def _kwarg(key: str, value: typing.Any, func: typing.Any): magic = get_magic(func) |