urls - allow to block channels in config

[erebus.git] / ctlmod.py

diff --git a/ctlmod.py b/ctlmod.py
index 09ce8fa51022b66d024306f2602ae68d458efdf0..c273638013bb96f94cddcc139397224c0a069577 100644 (file)
--- a/ctlmod.py
+++ b/ctlmod.py
@@ -1,4 +1,5 @@
 # Erebus IRC bot - Author: John Runyon
+# vim: fileencoding=utf-8
 # module loading/unloading/tracking code
 
 from __future__ import print_function
@@ -7,9 +8,9 @@ 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
+       importlib.invalidate_caches = lambda: None # invalidate_caches doesn't exist in Py2
 
 modules = {}
 dependents = {}
@@ -77,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