From fa140e7f2a03023b83ef37f155a3fbefb1bda8c5 Mon Sep 17 00:00:00 2001 From: Pavel Zuna Date: Tue, 25 Aug 2009 14:37:41 +0200 Subject: Remove parent_key parameter kwarg. Also replace a TYPE_ERROR with ValidationError. --- ipalib/parameters.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'ipalib/parameters.py') diff --git a/ipalib/parameters.py b/ipalib/parameters.py index 1b3b2b719..f05c1ed48 100644 --- a/ipalib/parameters.py +++ b/ipalib/parameters.py @@ -227,7 +227,6 @@ class Param(ReadOnly): ('required', bool, True), ('multivalue', bool, False), ('primary_key', bool, False), - ('parent_key', bool, False), ('normalizer', callable, None), ('default_from', DefaultFrom, None), ('create_default', callable, None), @@ -631,12 +630,10 @@ class Param(ReadOnly): def _validate_scalar(self, value, index=None): if type(value) is not self.type: - if index is None: - name = 'value' - else: - name = 'value[%d]' % index - raise TypeError( - TYPE_ERROR % (name, self.type, value, type(value)) + raise ValidationError(name=self.name, + error='need a %r; got %r (a %r)' % ( + self.type, value, type(value) + ) ) if index is not None and type(index) is not int: raise TypeError( -- cgit