Core: fixed py3k incompatibility

Also abstracted getting the list of objects that may register RMI
calls into a separate function.

1 files changed, 8 insertions, 2 deletions

diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 6357baae4..da278e4ed 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -973,11 +973,17 @@ class BaseCore(object):
         raise xmlrpclib.Fault(xmlrpclib.APPLICATION_ERROR,
                               "Critical failure: %s" % message)
 
+    def _get_rmi_objects(self):
+        """ Get a dict (name: object) of all objects that may have RMI
+        calls.  Currently, that includes all plugins and the FAM. """
+        rv = {self.fam.__class__.__name__: self.fam}
+        rv.update(self.plugins)
+        return rv
+
     def _get_rmi(self):
         """ Get a list of RMI calls exposed by plugins """
         rmi = dict()
-        for pname, pinst in self.plugins.items() + \
-                [(self.fam.__class__.__name__, self.fam)]:
+        for pname, pinst in self._get_rmi_objects():
             for mname in pinst.__rmi__:
                 rmi["%s.%s" % (pname, mname)] = getattr(pinst, mname)
         return rmi