aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar jesopo2020-01-28 10:20:52 +0000
committerGravatar jesopo2020-01-28 10:20:52 +0000
commit499a03a0ad41e70f1fbf9fd3854ea6547ea3b078 (patch)
treefc41ee2a3660238132aaca36e73a6258376ec96d /src
parentfix privateonly/channelonly - True or None, not True or False (diff)
signature
add module name collision check to before import and hooks
Diffstat (limited to 'src')
-rw-r--r--src/ModuleManager.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ModuleManager.py b/src/ModuleManager.py
index 7878dd13..2e43711d 100644
--- a/src/ModuleManager.py
+++ b/src/ModuleManager.py
@@ -217,6 +217,10 @@ class ModuleManager(object):
def _load_module(self, bot: "IRCBot.Bot", definition: ModuleDefinition,
check_dependency: bool=True) -> LoadedModule:
+ if definition.name in self.modules:
+ raise ModuleNameCollisionException("Module name '%s' "
+ "attempted to be used twice" % definition.name)
+
if check_dependency:
dependencies = definition.get_dependencies()
for dependency in dependencies:
@@ -270,10 +274,6 @@ class ModuleManager(object):
for key, value in magic.get_exports():
context_exports.add(key, value)
- if definition.name in self.modules:
- raise ModuleNameCollisionException("Module name '%s' "
- "attempted to be used twice" % definition.name)
-
return LoadedModule(definition.name, module_title, module_object,
context, import_name)