From 7e3664a964e6c0ef0c773ae8eb3ab3ac21385649 Mon Sep 17 00:00:00 2001
From: Jason Gerard DeRose <jderose@redhat.com>
Date: Thu, 4 Sep 2008 01:01:40 +0000
Subject: 250: Updated Option.validate to utilize the ValidationError.index
 attribute; updated unit tests for Option.validate to test use of index
 attribute

---
 ipalib/public.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'ipalib/public.py')

diff --git a/ipalib/public.py b/ipalib/public.py
index 915a1890..91f357ca 100644
--- a/ipalib/public.py
+++ b/ipalib/public.py
@@ -144,18 +144,16 @@ class Option(plugable.ReadOnly):
         for rule in self.rules:
             error = rule(value)
             if error is not None:
-                raise errors.RuleError(self.name, value, error, rule)
+                raise errors.RuleError(
+                    self.name, value, error, rule, index=index
+                )
 
     def validate(self, value):
-        if value is None and self.required:
-            raise errors.RequirementError(self.name)
-        else:
-            return
         if self.multivalue:
             if type(value) is not tuple:
-                raise TypeError('multivalue must be a tuple; got %r' % value)
-            for v in value:
-                self.__validate_scalar(v)
+                raise_TypeError(value, tuple, 'value')
+            for (i, v) in enumerate(value):
+                self.__validate_scalar(v, i)
         else:
             self.__validate_scalar(value)
 
-- 
cgit