From 1b93ad69a1079f649aff1e46ead7ad88420c2255 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 20 Sep 2022 13:51:06 +0200 Subject: [PATCH] Changing the base of LdapConfiguration to PpBaseConfiguration --- lib/pp_admintools/config/ldap.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/pp_admintools/config/ldap.py b/lib/pp_admintools/config/ldap.py index 113722f..f790235 100644 --- a/lib/pp_admintools/config/ldap.py +++ b/lib/pp_admintools/config/ldap.py @@ -20,19 +20,19 @@ import re # from fb_tools.common import pp from fb_tools.common import is_sequence, to_bool -# from .config import ConfigError, BaseConfiguration -from fb_tools.multi_config import MultiConfigError, BaseMultiConfig from fb_tools.multi_config import DEFAULT_ENCODING from fb_tools.obj import FbGenericBaseObject, FbBaseObject +from . import PpConfigurationError, PpBaseConfiguration + from .. import MAX_PORT_NUMBER, DEFAULT_CONFIG_DIR from . import VALID_TIERS, DEFAULT_TIER from ..xlate import XLATOR -__version__ = '0.3.1' +__version__ = '0.4.1' LOG = logging.getLogger(__name__) _ = XLATOR.gettext @@ -43,7 +43,7 @@ DEFAULT_TIMEOUT = 20 MAX_TIMEOUT = 3600 # ============================================================================= -class LdapConfigError(MultiConfigError): +class LdapConfigError(PpConfigurationError): """Base error class for all exceptions happened during execution this configured application""" @@ -335,7 +335,7 @@ class LdapConnectionDict(dict, FbGenericBaseObject): # ============================================================================= -class LdapConfiguration(BaseMultiConfig): +class LdapConfiguration(PpBaseConfiguration): """ A class for providing a configuration for an arbitrary Application working with one or more LDAP connections, and methods to read it from configuration files. -- 2.39.5