diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2012-03-23 10:51:32 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2012-03-23 10:51:32 -0500 |
commit | 3063e41f480a6143b42a0eff6e4ca17bbfc0d1db (patch) | |
tree | 204e6b486ab7c7a8f9c29ad3ec77a4e344272098 /src/lib/Server/Plugin.py | |
parent | 397c17ffc5755d2b41ccfa01225d4f42cb9545c1 (diff) | |
parent | 746293b2f242c099037aac19f14f65e68d036270 (diff) | |
download | bcfg2-3063e41f480a6143b42a0eff6e4ca17bbfc0d1db.tar.gz bcfg2-3063e41f480a6143b42a0eff6e4ca17bbfc0d1db.tar.bz2 bcfg2-3063e41f480a6143b42a0eff6e4ca17bbfc0d1db.zip |
Merge branch 'maint'
Diffstat (limited to 'src/lib/Server/Plugin.py')
-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 f423bea2e..06de18f29 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -1199,27 +1199,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: |