X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/e38786129fcb0d996fa7e00bb0d06e359b3e090e..c889fbb1f64a7eac7de813eb24326139c58c7b18:/ctlmod.py

diff --git a/ctlmod.py b/ctlmod.py
index 73ae1fc..db8a5b8 100644
--- a/ctlmod.py
+++ b/ctlmod.py
@@ -12,8 +12,15 @@ def modhas(modname, attname): return getattr(modules[modname], attname, None) is
 
 def load(parent, modname):
 	if not isloaded(modname):
-		mod = __import__(modname)
-		reload(mod)
+		sys.path.insert(0, 'modules')
+		try:
+			mod = __import__(modname)
+			reload(mod) #in case it's been previously loaded.
+		except BaseException as e: #we don't want even sys.exit() to crash us (in case of malicious module) so use BaseException
+			return modlib.error(e)
+		finally:
+			del sys.path[0] #remove ./modules from path, in case there's a name conflict
+
 
 		if not hasattr(mod, 'modinfo'):
 			return modlib.error('no modinfo')
@@ -60,13 +67,14 @@ def reloadmod(parent, modname):
 		else: modules[modname].modstop(parent)
 
 		try:
-			return reload(modules[modname])
-		except BaseException, e:
+			reload(modules[modname])
+		except BaseException as e:
 			return modlib.error(e)
 
-		if modhas(modname, 'modrestarted'): modules[modname].modrestarted(parent)
-		else: modules[modname].modstart(parent)
+		if modhas(modname, 'modrestarted'): ret = modules[modname].modrestarted(parent)
+		else: ret = modules[modname].modstart(parent)
 
+		return ret
 	else:
 		return load(parent, modname)