can make_dict with disabled suboption

This commit is contained in:
2014-03-12 14:57:36 +01:00
parent d7b04ebed0
commit 544cd93c73
2 changed files with 25 additions and 10 deletions

View File

@ -448,17 +448,20 @@ class SubConfig(object):
return pathsvalues
def _make_sub_dict(self, opt, path, pathsvalues, _currpath, flatten):
if isinstance(opt, OptionDescription):
pathsvalues += getattr(self, path).make_dict(flatten,
_currpath +
path.split('.'))
else:
value = self._getattr(opt._name)
if flatten:
name = opt._name
try:
if isinstance(opt, OptionDescription):
pathsvalues += getattr(self, path).make_dict(flatten,
_currpath +
path.split('.'))
else:
name = '.'.join(_currpath + [opt._name])
pathsvalues.append((name, value))
value = self._getattr(opt._name)
if flatten:
name = opt._name
else:
name = '.'.join(_currpath + [opt._name])
pathsvalues.append((name, value))
except PropertiesOptionError:
pass
def cfgimpl_get_path(self):
descr = self.cfgimpl_get_description()