diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-09 08:52:07 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-09 08:52:25 -0400 |
| commit | 37f828a8cce5b5e051f5b5b3c1311ae38eed95a1 (patch) | |
| tree | e426f7b833bc0dcf64804aa6c45982bfdc32d28f /src/lib/Bcfg2/Server/MultiprocessingCore.py | |
| parent | bb3445f5e474fc3d5cba019d522ec43ff10aaa6c (diff) | |
| download | bcfg2-37f828a8cce5b5e051f5b5b3c1311ae38eed95a1.tar.gz bcfg2-37f828a8cce5b5e051f5b5b3c1311ae38eed95a1.tar.bz2 bcfg2-37f828a8cce5b5e051f5b5b3c1311ae38eed95a1.zip | |
Core: fixed py3k incompatibility
Also abstracted getting the list of objects that may register RMI
calls into a separate function.
Diffstat (limited to 'src/lib/Bcfg2/Server/MultiprocessingCore.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/MultiprocessingCore.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/MultiprocessingCore.py b/src/lib/Bcfg2/Server/MultiprocessingCore.py index e79207291..e7518ca18 100644 --- a/src/lib/Bcfg2/Server/MultiprocessingCore.py +++ b/src/lib/Bcfg2/Server/MultiprocessingCore.py @@ -298,8 +298,7 @@ class ChildCore(BaseCore): def _get_rmi(self): rmi = dict() - for pname, pinst in self.plugins.items() + \ - [(self.fam.__class__.__name__, self.fam)]: + for pname, pinst in self._get_rmi_objects(): for crmi in pinst.__child_rmi__: if isinstance(crmi, tuple): mname = crmi[1] @@ -413,8 +412,7 @@ class Core(BuiltinCore): def _get_rmi(self): child_rmi = dict() - for pname, pinst in self.plugins.items() + \ - [(self.fam.__class__.__name__, self.fam)]: + for pname, pinst in self._get_rmi_objects(): for crmi in pinst.__child_rmi__: if isinstance(crmi, tuple): parentname, childname = crmi |