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')
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)