From 6f95249d5274258d0935a439407f38030205bf65 Mon Sep 17 00:00:00 2001
From: Jason Gerard DeRose <jderose@redhat.com>
Date: Thu, 4 Sep 2008 08:33:41 +0000
Subject: 261: More work on demo using Option.__call__() for interactive input

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

(limited to 'ipalib/public.py')

diff --git a/ipalib/public.py b/ipalib/public.py
index d1f2ff35..7734bf7a 100644
--- a/ipalib/public.py
+++ b/ipalib/public.py
@@ -164,7 +164,10 @@ class Option(plugable.ReadOnly):
         if self.default_from is not None:
             default = self.default_from(**kw)
             if default is not None:
-                return self.convert(default)
+                try:
+                    return self.convert(self.normalize(default))
+                except errors.ValidationError:
+                    return None
         return self.default
 
     def get_values(self):
@@ -179,10 +182,12 @@ class Option(plugable.ReadOnly):
             value = self.get_default(**kw)
         if value is None:
             if self.required:
-                raise RequirementError(option.name)
+                raise errors.RequirementError(self.name)
             return None
         else:
-            pass
+            value = self.convert(self.normalize(value))
+            self.validate(value)
+            return value
 
 
 class Command(plugable.Plugin):
-- 
cgit