From de63e95de3fb5410e55f19f2dec4f83034438c29 Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jcholast@redhat.com>
Date: Tue, 14 Aug 2012 15:53:25 +0200
Subject: Raise Base64DecodeError instead of ConversionError when base64
 decoding fails in Bytes parameters.

ticket 2962
---
 ipalib/parameters.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ipalib/parameters.py')

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)
 
 
-- 
cgit