remove some try/except + consistency not works with submulti

This commit is contained in:
2016-01-03 13:23:15 +01:00
parent cc6b4ad7c4
commit e8764f6173
13 changed files with 273 additions and 259 deletions

View File

@ -19,7 +19,7 @@
# ____________________________________________________________
from ...i18n import _
from ...setting import undefined
from ...error import ConfigError, ContextError
from ...error import ConfigError
static_tuple = tuple()
static_set = frozenset()
@ -94,15 +94,12 @@ class StorageBase(object):
_setattr(self, '_default', default)
if is_multi and default_multi is not None:
try:
self._validate(default_multi)
except ValueError as err: # pragma: optional cover
err = self._validate(default_multi)
if err:
raise ValueError(_("invalid default_multi value {0} "
"for option {1}: {2}").format(
str(default_multi),
self.impl_getname(), str(err)))
except ContextError, err:
pass
_setattr(self, '_default_multi', default_multi)
# information

View File

@ -326,7 +326,9 @@ class _Base(SqlAlchemyBase):
def _set_default_values(self, default, default_multi):
self._default = default
if self.impl_is_multi() and default_multi is not None:
self._validate(default_multi)
err = self._validate(default_multi)
if err:
raise err
self._default_multi = default_multi
def _get_consistencies(self):