diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-09 09:41:54 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-09 09:41:54 -0400 |
commit | 8eb46ebcba381c79ff2e35eb91f35d28bd870016 (patch) | |
tree | 7cfe3816fa9eaae5cafd0f3f1b26c2e71aad1c2c /src | |
parent | 37f828a8cce5b5e051f5b5b3c1311ae38eed95a1 (diff) | |
download | bcfg2-8eb46ebcba381c79ff2e35eb91f35d28bd870016.tar.gz bcfg2-8eb46ebcba381c79ff2e35eb91f35d28bd870016.tar.bz2 bcfg2-8eb46ebcba381c79ff2e35eb91f35d28bd870016.zip |
Core: iterate over RMI objects properly
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/MultiprocessingCore.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index da278e4ed..a8601fd08 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -983,7 +983,7 @@ class BaseCore(object): def _get_rmi(self): """ Get a list of RMI calls exposed by plugins """ rmi = dict() - for pname, pinst in self._get_rmi_objects(): + for pname, pinst in self._get_rmi_objects().items(): for mname in pinst.__rmi__: rmi["%s.%s" % (pname, mname)] = getattr(pinst, mname) return rmi diff --git a/src/lib/Bcfg2/Server/MultiprocessingCore.py b/src/lib/Bcfg2/Server/MultiprocessingCore.py index e7518ca18..c0c8fd9e1 100644 --- a/src/lib/Bcfg2/Server/MultiprocessingCore.py +++ b/src/lib/Bcfg2/Server/MultiprocessingCore.py @@ -298,7 +298,7 @@ class ChildCore(BaseCore): def _get_rmi(self): rmi = dict() - for pname, pinst in self._get_rmi_objects(): + for pname, pinst in self._get_rmi_objects().items(): for crmi in pinst.__child_rmi__: if isinstance(crmi, tuple): mname = crmi[1] @@ -412,7 +412,7 @@ class Core(BuiltinCore): def _get_rmi(self): child_rmi = dict() - for pname, pinst in self._get_rmi_objects(): + for pname, pinst in self._get_rmi_objects().items(): for crmi in pinst.__child_rmi__: if isinstance(crmi, tuple): parentname, childname = crmi |