urls - beautifulsoup: use encoding from Content-Type if available

[erebus.git] / ctlmod.py

diff --git a/ctlmod.py b/ctlmod.py
index 4d12d214a2e7f261f462f5ec4bcb1be9b00ed2ad..c273638013bb96f94cddcc139397224c0a069577 100644 (file)
--- a/ctlmod.py
+++ b/ctlmod.py
@@ -1,13 +1,16 @@
 # Erebus IRC bot - Author: John Runyon
+# vim: fileencoding=utf-8
 # module loading/unloading/tracking code
 
 from __future__ import print_function
 
-import sys, time
+import sys, time, importlib
 import modlib
 
 if sys.version_info.major >= 3:
-       from importlib import reload
+       from importlib import reload # reload is only available as a global in Py2, only in importlib in Py3
+else:
+       importlib.invalidate_caches = lambda: None # invalidate_caches doesn't exist in Py2
 
 modules = {}
 dependents = {}
@@ -17,7 +20,7 @@ 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), end=' ')
        else:
@@ -41,11 +44,12 @@ def load(parent, modname, dependent=False):
        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(), ['*'], 0)
-                       # ^ 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)
@@ -74,9 +78,8 @@ def _load(parent, modname, dependent=False):
                        if bool(int(parent.cfg.get('autoloads', dep, default=1))):
                                if dep not in modules:
                                        depret = load(parent, dep, dependent=True)
-                                       if depret is not None:
-                                               if not depret:
-                                                       successstatus.append("softdep %s failed" % (dep))
+                                       if depret is not None and not depret:
+                                               successstatus.append("softdep %s failed" % (dep))
                        else:
                                successstatus.append("softdep %s disabled" % (dep))
                        #swallow errors loading - softdeps are preferred, not required