diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-03-22 13:23:17 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-03-22 13:23:17 -0400 |
| commit | 728fddbdd5ed5e327f3b1c1e9a6b4f2da1b2a360 (patch) | |
| tree | 4510f6d1a009c11454054f64e64256df353f35bf /src/lib | |
| parent | 1b7462de5d95b8d195866c1bafb9fb8b6957334e (diff) | |
| download | bcfg2-728fddbdd5ed5e327f3b1c1e9a6b4f2da1b2a360.tar.gz bcfg2-728fddbdd5ed5e327f3b1c1e9a6b4f2da1b2a360.tar.bz2 bcfg2-728fddbdd5ed5e327f3b1c1e9a6b4f2da1b2a360.zip | |
fixed SimpleConfig for py3k
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Server/Plugin.py | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index 1ceed702d..692aa8a81 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -1203,27 +1203,32 @@ class SimpleConfig(FileBacked, self.remove_section(section) self.read(self.name) - def get(self, section, option, default=None): + def get(self, section, option, **kwargs): """ convenience method for getting config items """ + default = None + if 'default' in kwargs: + default = kwargs['default'] + del kwargs['default'] try: - return ConfigParser.SafeConfigParser.get(self, section, option) + return ConfigParser.SafeConfigParser.get(self, section, option, + **kwargs) except (ConfigParser.NoSectionError, ConfigParser.NoOptionError): if default is not None: return default else: raise - def getboolean(self, section, option, default=None): + def getboolean(self, section, option, **kwargs): """ convenience method for getting boolean config items """ + default = None + if 'default' in kwargs: + default = kwargs['default'] + del kwargs['default'] try: - return ConfigParser.SafeConfigParser.getboolean(self, - section, option) - except (ConfigParser.NoSectionError, ConfigParser.NoOptionError): - if default is not None: - return default - else: - raise - except ValueError: + return ConfigParser.SafeConfigParser.getboolean(self, section, + option, **kwargs) + except (ConfigParser.NoSectionError, ConfigParser.NoOptionError, + ValueError): if default is not None: return default else: |