diff options
author | Jan Cholasta <jcholast@redhat.com> | 2012-08-14 15:53:25 +0200 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2012-08-14 15:55:44 +0200 |
commit | de63e95de3fb5410e55f19f2dec4f83034438c29 (patch) | |
tree | 77cf0e440f6730da5a68f22c53dc3ea6f46ce095 /ipalib/parameters.py | |
parent | 2e00a9f45cd7c3191902f9b20ec4879096589219 (diff) | |
download | freeipa-de63e95de3fb5410e55f19f2dec4f83034438c29.tar.gz freeipa-de63e95de3fb5410e55f19f2dec4f83034438c29.tar.xz freeipa-de63e95de3fb5410e55f19f2dec4f83034438c29.zip |
Raise Base64DecodeError instead of ConversionError when base64 decoding fails in Bytes parameters.
ticket 2962
Diffstat (limited to 'ipalib/parameters.py')
-rw-r--r-- | ipalib/parameters.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipalib/parameters.py b/ipalib/parameters.py index dd505a179..1dd6ed3d0 100644 --- a/ipalib/parameters.py +++ b/ipalib/parameters.py @@ -109,7 +109,7 @@ from types import NoneType from text import _ as ugettext from plugable import ReadOnly, lock, check_name from errors import ConversionError, RequirementError, ValidationError -from errors import PasswordMismatch +from errors import PasswordMismatch, Base64DecodeError from constants import NULLS, TYPE_ERROR, CALLABLE_ERROR from text import Gettext, FixMe from ipapython.dn import DN @@ -1452,8 +1452,8 @@ class Bytes(Data): if isinstance(value, unicode): try: value = base64.b64decode(value) - except TypeError: - raise ConversionError(name=self.get_param_name(), index=index, error=self.type_error) + except TypeError, e: + raise Base64DecodeError(reason=str(e)) return super(Bytes, self)._convert_scalar(value, index) |