add ModuleManager.try_reload_module(), use it for !reloadmodule

Author: jesopo

src/ModuleManager.py

@@ -402,6 +402,20 @@ def _unload_module(self, loaded_module: LoadedModule):
                 [loaded_module.name,
                 ", ".join([str(referrer) for referrer in referrers])])
 
+    def try_reload_module(self, bot: "IRCBot.Bot", name: str):
+        loaded_module = self.modules.pop(name)
+        loaded_module.module.on_pause()
+
+        new_definition = self.find_module(name)
+        try:
+            self.load_module(bot, new_definition)
+        except:
+            loaded_module.module.on_resume()
+            self.modules[definition.name] = loaded_module
+            raise
+
+        self._unload_module(loaded_module)
+
     def try_reload_modules(self, bot: "IRCBot.Bot",
             whitelist: typing.List[str], blacklist: typing.List[str]):
         loadable, nonloadable = self._list_valid_modules(

src/core_modules/modules.py

@@ -68,18 +68,14 @@ def unload(self, event):
         self._catch(name, lambda: self.bot.modules.unload_module(name))
         event["stdout"].write("Unloaded '%s'" % name)
 
-    def _reload(self, name):
-        self.bot.modules.unload_module(name)
-        definition = self._catch(name,
-            lambda: self.bot.modules.find_module(name))
-        self.bot.modules.load_module(self.bot, definition)
     @utils.hook("received.command.reloadmodule")
     @utils.kwarg("help", "Reload a module")
     @utils.kwarg("permission", "reloadmodule")
     @utils.spec("!<name>wordlower")
     def reload(self, event):
         name = event["spec"][0]
-        self._catch(name, lambda: self._reload(name))
+        self._catch(name,
+            lambda: self.bot.modules.try_reload_module(self.bot, name))
         event["stdout"].write("Reloaded '%s'" % name)
 
     @utils.hook("received.command.reloadallmodules")