From: zonidjan <redacted>
Date: Thu, 10 Sep 2015 06:23:26 +0000 (-0500)
Subject: hopefully fix module name conflicts
X-Git-Url: https://jfr.im/git/erebus.git/commitdiff_plain/6e2b575fa8dd4d48fe2f7400bb3b9180a4547bb8?ds=inline

hopefully fix module name conflicts
---

diff --git a/ctlmod.py b/ctlmod.py
index 8cfa7d0..0a4c784 100644
--- a/ctlmod.py
+++ b/ctlmod.py
@@ -12,11 +12,14 @@ def modhas(modname, attname): return getattr(modules[modname], attname, None) is
 
 def load(parent, modname):
 	if not isloaded(modname):
+		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'):