diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2015-04-08 09:44:14 -0400 |
|---|---|---|
| committer | Simo Sorce <simo@redhat.com> | 2015-04-10 10:38:15 -0400 |
| commit | 434bffc3b1ab4a74f0f23508e624e7427987aaf8 (patch) | |
| tree | de5dcf9470706563e4fc348eeac654e38e47cc9a /ipsilon/providers | |
| parent | e235c7be58ddf563ed6fd6d6f52dbc96497b0389 (diff) | |
| download | ipsilon-434bffc3b1ab4a74f0f23508e624e7427987aaf8.tar.gz ipsilon-434bffc3b1ab4a74f0f23508e624e7427987aaf8.tar.xz ipsilon-434bffc3b1ab4a74f0f23508e624e7427987aaf8.zip | |
Rename and move PluginConfig to ConfigHelper
The configuration class was originally intended to be tied. At this
point it is quite generic and useful outside of plugins. Rename
it to something more generic and move it into the config module.
https://fedorahosted.org/ipsilon/ticket/25
Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>
Diffstat (limited to 'ipsilon/providers')
| -rw-r--r-- | ipsilon/providers/common.py | 7 | ||||
| -rw-r--r-- | ipsilon/providers/saml2/provider.py | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ipsilon/providers/common.py b/ipsilon/providers/common.py index 74c00df..a0158d9 100644 --- a/ipsilon/providers/common.py +++ b/ipsilon/providers/common.py @@ -17,7 +17,8 @@ from ipsilon.util.log import Log from ipsilon.util.plugin import PluginInstaller, PluginLoader -from ipsilon.util.plugin import PluginObject, PluginConfig +from ipsilon.util.plugin import PluginObject +from ipsilon.util.config import ConfigHelper from ipsilon.util.page import Page from ipsilon.util.page import admin_protect from ipsilon.rest.common import RestPage @@ -49,10 +50,10 @@ class InvalidRequest(ProviderException): self._debug(message) -class ProviderBase(PluginConfig, PluginObject): +class ProviderBase(ConfigHelper, PluginObject): def __init__(self, name, path, *pargs): - PluginConfig.__init__(self) + ConfigHelper.__init__(self) PluginObject.__init__(self, *pargs) self.name = name self._root = None diff --git a/ipsilon/providers/saml2/provider.py b/ipsilon/providers/saml2/provider.py index 1143c9f..d3cc144 100644 --- a/ipsilon/providers/saml2/provider.py +++ b/ipsilon/providers/saml2/provider.py @@ -17,7 +17,7 @@ from ipsilon.providers.common import ProviderException from ipsilon.util import config as pconfig -from ipsilon.util.plugin import PluginConfig +from ipsilon.util.config import ConfigHelper from ipsilon.tools.saml2metadata import SAML2_NAMEID_MAP from ipsilon.util.log import Log import lasso @@ -46,7 +46,7 @@ class NameIdNotAllowed(Exception): return repr(self.message) -class ServiceProviderConfig(PluginConfig): +class ServiceProviderConfig(ConfigHelper): def __init__(self): super(ServiceProviderConfig, self).__init__() |