From e50290046a8855aa3e24da3dc759b443e61b6f05 Mon Sep 17 00:00:00 2001 From: jesopo Date: Mon, 14 Oct 2019 13:02:16 +0100 Subject: [PATCH] remove `safe` arg from ModuleManager.load_modules() - try_reload_modules covers this now --- src/IRCBot.py | 4 ++-- src/ModuleManager.py | 2 +- 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)