x/opencafe
Code Issues Proposed changes

Allows defaults for un-configured ConfigSectionInterfaces.

Browse Source 
* Properties of ConfigSectionInterface classes now return optional
  default values when section is undefined in the datasource.
  (Previously, these properties would return None, even when
   defaults where provided)

Change-Id: Ic06d7412aa11dfbbd3e8db03262e815f0cc17dec
This commit is contained in:
Jose Idar
2014-01-21 15:04:01 -06:00
parent a25bfe15fc
commit cea30f16bd
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cafe/engine/models/data_interfaces.py
View File

@@ -132,35 +132,25 @@ class ConfigParserDataSource(DataSource):
try: try:
return self._data_source.get(self._section_name, item_name) return self._data_source.get(self._section_name, item_name)
except ConfigParser.NoOptionError as e: except (ConfigParser.NoOptionError, ConfigParser.NoSectionError) as e:
self._log.error(str(e)) self._log.error(str(e))
return default return default
except ConfigParser.NoSectionError as e:
self._log.error(str(e))
pass
def get_raw(self, item_name, default=None): def get_raw(self, item_name, default=None):
try: try:
return self._data_source.get(self._section_name, item_name, return self._data_source.get(
raw=True) self._section_name, item_name, raw=True)
except ConfigParser.NoOptionError as e: except (ConfigParser.NoOptionError, ConfigParser.NoSectionError) as e:
self._log.error(str(e)) self._log.error(str(e))
return default return default
except ConfigParser.NoSectionError as e:
self._log.error(str(e))
pass
def get_boolean(self, item_name, default=None): def get_boolean(self, item_name, default=None):
try: try:
return self._data_source.getboolean(self._section_name, return self._data_source.getboolean(self._section_name, item_name)
item_name) except (ConfigParser.NoOptionError, ConfigParser.NoSectionError) as e:
except ConfigParser.NoOptionError as e:
self._log.error(str(e)) self._log.error(str(e))
return default return default
except ConfigParser.NoSectionError as e:
self._log.error(str(e))
pass
class DictionaryDataSource(DataSource): class DictionaryDataSource(DataSource):