nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Fix module unload and reload

Browse Source
This commit is contained in:
nemunaire 2015-10-09 00:24:44 +02:00
parent db70974504
commit fd8567c60c
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nemubot/bot.py
View File

@ -19,6 +19,7 @@
from datetime import datetime, timedelta, timezone from datetime import datetime, timedelta, timezone
import logging import logging
import threading import threading
import sys
from nemubot import __version__ from nemubot import __version__
from nemubot.consumer import Consumer, EventConsumer, MessageConsumer from nemubot.consumer import Consumer, EventConsumer, MessageConsumer
@ -372,12 +373,9 @@ class Bot(threading.Thread):
""" """
if name in self.modules: if name in self.modules:
import imp
self.unload_module(name) self.unload_module(name)
tt = __import__(name)
imp.reload(tt) __import__(name)
else:
__import__(name)
def add_module(self, module): def add_module(self, module):
@ -433,12 +431,24 @@ class Bot(threading.Thread):
"""Unload a module""" """Unload a module"""
if name in self.modules: if name in self.modules:
self.modules[name].print("Unloading module %s" % name) self.modules[name].print("Unloading module %s" % name)
# Call the user defined unload method
if hasattr(self.modules[name], "unload"): if hasattr(self.modules[name], "unload"):
self.modules[name].unload(self) self.modules[name].unload(self)
self.modules[name].__nemubot_context__.unload() self.modules[name].__nemubot_context__.unload()
# Remove from the dict
# Remove from the nemubot dict
del self.modules[name] del self.modules[name]
# Remove from the Python dict
del sys.modules[name]
for mod in [i for i in sys.modules]:
if mod[:len(name) + 1] == name + ".":
logger.debug("Module '%s' also removed from system modules list.", mod)
del sys.modules[mod]
logger.info("Module `%s' successfully unloaded.", name) logger.info("Module `%s' successfully unloaded.", name)
return True return True
return False return False