Infra/tiramisu
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove some try/except

Browse Source
This commit is contained in:
Emmanuel Garette
2015-12-30 22:32:07 +01:00
parent 729db2ceec
commit d0e2b5d8c4
6 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tiramisu/option/baseoption.py
View File

@ -885,10 +885,7 @@ class SymLinkOption(OnlyOption):
return self._impl_getopt().impl_is_multi()
def _is_subdyn(self):
try:
return self._impl_getopt()._subdyn is not None
except AttributeError:
return False
return getattr(self._impl_getopt(), '_subdyn', None) is not None
class DynSymLinkOption(object):

23
tiramisu/option/masterslave.py
View File

@ -143,12 +143,9 @@ class MasterSlaves(object):
if index is None and validate is True:
masterlen = len(value)
for slave in self.getslaves(opt):
try:
slave_path = slave.impl_getpath(values._getcontext())
slavelen = values._p_.get_max_length(slave_path)
self.validate_slave_length(masterlen, slavelen, slave.impl_getname(), opt)
except ConfigError: # pragma: optional cover
pass
slave_path = slave.impl_getpath(values._getcontext())
slavelen = values._p_.get_max_length(slave_path)
self.validate_slave_length(masterlen, slavelen, slave.impl_getname(), opt)
return value
def _getslave(self, values, opt, path, validate, force_permissive,
@ -185,12 +182,14 @@ class MasterSlaves(object):
multi = values._get_multi(opt, path)
if masterlen == 0:
if validate_properties:
context.cfgimpl_get_settings().validate_properties(opt, False,
False,
value=multi,
path=path,
force_permissive=force_permissive,
setting_properties=setting_properties)
props = context.cfgimpl_get_settings().validate_properties(opt, False,
False,
value=multi,
path=path,
force_permissive=force_permissive,
setting_properties=setting_properties)
if props:
raise props
else:
one_has_value = False
if index is None: