X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/a62d0d18bbb5926d22df18db5eba53eb21a10817..b376c8253cf227f11e50157fd10c02b1cd784646:/ctlmod.py

diff --git a/ctlmod.py b/ctlmod.py
index dbd2a36..09ce8fa 100644
--- a/ctlmod.py
+++ b/ctlmod.py
@@ -1,9 +1,16 @@
 # Erebus IRC bot - Author: John Runyon
 # module loading/unloading/tracking code
 
-import sys, time
+from __future__ import print_function
+
+import sys, time, importlib
 import modlib
 
+if sys.version_info.major >= 3:
+	from importlib import reload
+else:
+	importlib.invalidate_caches = lambda: None
+
 modules = {}
 dependents = {}
 #dependents[modname] = [list of modules which depend on modname]
@@ -12,35 +19,36 @@ def isloaded(modname): return modname in modules
 def modhas(modname, attname): return getattr(modules[modname], attname, None) is not None
 
 def load(parent, modname, dependent=False):
-	#wrapper to call _load and print return
+	"""Wrapper to call _load and print the return value."""
 	if dependent:
-		print "(Loading dependency %s..." % (modname),
+		print("(Loading dependency %s..." % (modname), end=' ')
 	else:
-		print "%09.3f [MOD] [?] Loading %s..." % (time.time() % 100000, modname),
+		print("%09.3f [MOD] [?] Loading %s..." % (time.time() % 100000, modname), end=' ')
 	modstatus = _load(parent, modname, dependent)
 	if not modstatus:
 		if dependent:
-			print "failed: %s)" % (modstatus),
+			print("failed: %s)" % (modstatus), end=' ')
 		else:
-			print "failed: %s." % (modstatus)
+			print("failed: %s." % (modstatus))
 	elif modstatus == True:
 		if dependent:
-			print "OK)",
+			print("OK)", end=' ')
 		else:
-			print "OK."
+			print("OK.")
 	else:
 		if dependent:
-			print "OK: %s)" % (modstatus),
+			print("OK: %s)" % (modstatus), end=' ')
 		else:
-			print "OK: %s." % (modstatus)
+			print("OK: %s." % (modstatus))
 	return modstatus
 
 def _load(parent, modname, dependent=False):
+	"""Load and return the new status of the module."""
 	successstatus = []
 	if not isloaded(modname):
+		importlib.invalidate_caches()
 		try:
-			mod = __import__('modules.'+modname, globals(), locals(), ['*'], -1)
-			# ^ fromlist doesn't actually do anything(?) but it means we don't have to worry about this returning the top-level "modules" object
+			mod = importlib.import_module('modules.'+modname)
 			reload(mod) #in case it's been previously loaded.
 		except Exception as e:
 			return modlib.error(e)