aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar jesopo2019-10-14 13:02:16 +0100
committerGravatar jesopo2019-10-14 13:02:16 +0100
commite50290046a8855aa3e24da3dc759b443e61b6f05 (patch)
tree0019b27b2f2443c8227f0fc5c8998209c38fd204
parentadd ModuleManager.try_reload_modules(), to try reloading in a transaction (diff)
signature
remove `safe` arg from ModuleManager.load_modules() - try_reload_modules covers this now
-rw-r--r--src/IRCBot.py4
-rw-r--r--src/ModuleManager.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/IRCBot.py b/src/IRCBot.py
index fbc74ad9..348a2ea8 100644
--- a/src/IRCBot.py
+++ b/src/IRCBot.py
@@ -161,11 +161,11 @@ class Bot(object):
return (db_whitelist|conf_whitelist, db_blacklist|conf_blacklist)
- def load_modules(self, safe: bool=False
+ def load_modules(self
) -> typing.Tuple[typing.List[str], typing.List[str]]:
whitelist, blacklist = self._module_lists()
return self.modules.load_modules(self, whitelist=whitelist,
- blacklist=blacklist, safe=safe)
+ blacklist=blacklist)
def try_reload_modules(self) -> ModuleManager.TryReloadResult:
whitelist, blacklist = self._module_lists()
return self.modules.try_reload_modules(self, whitelist=whitelist,
diff --git a/src/ModuleManager.py b/src/ModuleManager.py
index 74ef7d01..36221798 100644
--- a/src/ModuleManager.py
+++ b/src/ModuleManager.py
@@ -320,7 +320,7 @@ class ModuleManager(object):
return [definition_names[name] for name in definitions_ordered]
def load_modules(self, bot: "IRCBot.Bot", whitelist: typing.List[str]=[],
- blacklist: typing.List[str]=[], safe: bool=False
+ blacklist: typing.List[str]=[]
) -> typing.Tuple[typing.List[str], typing.List[str]]:
loadable, nonloadable = self._list_valid_modules(bot, whitelist, blacklist)