some corrections
This commit is contained in:
parent
9e378faef0
commit
54cb73c2cc
|
@ -118,11 +118,12 @@ class PropertiesOptionError(AttributeError):
|
||||||
self._name,
|
self._name,
|
||||||
prop_msg,
|
prop_msg,
|
||||||
msg))
|
msg))
|
||||||
self.msg = str(_('cannot access to {0} "{1}" because has {2} {3}'
|
else:
|
||||||
'').format(self._opt_type,
|
self.msg = str(_('cannot access to {0} "{1}" because has {2} {3}'
|
||||||
self._name,
|
'').format(self._opt_type,
|
||||||
prop_msg,
|
self._name,
|
||||||
msg))
|
prop_msg,
|
||||||
|
msg))
|
||||||
del self._path, self._index, self._requires, self._opt_type, self._name, self._config_bag
|
del self._path, self._index, self._requires, self._opt_type, self._name, self._config_bag
|
||||||
del self._settings, self._orig_opt
|
del self._settings, self._orig_opt
|
||||||
return self.msg
|
return self.msg
|
||||||
|
|
|
@ -518,11 +518,11 @@ class Settings(object):
|
||||||
# transitive action, add action
|
# transitive action, add action
|
||||||
if operator != 'and':
|
if operator != 'and':
|
||||||
if readable:
|
if readable:
|
||||||
for msg in self.apply_requires(err.path,
|
for msg in self.apply_requires(err._path,
|
||||||
err.requires,
|
err._requires,
|
||||||
err.index,
|
err._index,
|
||||||
True,
|
True,
|
||||||
err.config_bag).values():
|
err._config_bag).values():
|
||||||
calc_properties.setdefault(action, []).extend(msg)
|
calc_properties.setdefault(action, []).extend(msg)
|
||||||
else:
|
else:
|
||||||
calc_properties.add(action)
|
calc_properties.add(action)
|
||||||
|
|
Loading…
Reference in New Issue