summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-09-04 15:26:22 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-09-04 15:26:50 -0500
commit3c288e1d07b646c36b4f8769ff3ff153d5287b03 (patch)
tree627e6fe9040b6e88b49ea31174f855580ccfd844
parent2116c2b62512c7ec9f10a9ac523962f0671e94c1 (diff)
downloadnetconfapk-3c288e1d07b646c36b4f8769ff3ff153d5287b03.tar.gz
netconfapk-3c288e1d07b646c36b4f8769ff3ff153d5287b03.tar.bz2
netconfapk-3c288e1d07b646c36b4f8769ff3ff153d5287b03.tar.xz
netconfapk-3c288e1d07b646c36b4f8769ff3ff153d5287b03.zip
Server base: Fix some module loading issues
-rw-r--r--ncserver/base/modman.py2
-rw-r--r--ncserver/config.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/ncserver/base/modman.py b/ncserver/base/modman.py
index 1423be1..2c24788 100644
--- a/ncserver/base/modman.py
+++ b/ncserver/base/modman.py
@@ -157,7 +157,7 @@ class ModuleManager:
return None
if getattr(mod, 'M_IMPORTS', None) is not None:
- for imname, improps in mod.M_IMPORTS:
+ for imname, improps in mod.M_IMPORTS.items():
if imname in self.imports:
if not _import_compatible(self.imports[imname], improps):
self.logger.error(_("Module '%s' has incompatible "
diff --git a/ncserver/config.py b/ncserver/config.py
index 047e3a5..8bf2a7a 100644
--- a/ncserver/config.py
+++ b/ncserver/config.py
@@ -42,7 +42,7 @@ class ConfigManager:
except BaseException as exc: # pylint: disable=W0703
self._logger.error(_("Couldn't read configuration file: %s"), exc)
else:
- CONFIG_RELOADED.call()
+ CONFIG_RELOADED.call(self)
def get(self, clade: str, key: str):
"""Retrieve the value for the specified configuration key.