[gnue] r9076 - trunk/gnue-forms/src/input/displayHandlers

[reinhard]

Author: reinhard
Date: 2006-11-28 08:26:14 -0600 (Tue, 28 Nov 2006)
New Revision: 9076

Modified:
   trunk/gnue-forms/src/input/displayHandlers/Dropdown.py
Log:
Be more defensive about allowedValues.


Modified: trunk/gnue-forms/src/input/displayHandlers/Dropdown.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Dropdown.py      2006-11-28 
14:21:07 UTC (rev 9075)
+++ trunk/gnue-forms/src/input/displayHandlers/Dropdown.py      2006-11-28 
14:26:14 UTC (rev 9076)
@@ -63,13 +63,14 @@
     # TODO: Replace with formatter
     self.setValue(self.field.getValue())
 
-    if self.value == None:
+    if self.value is None:
       self.work = ""
     else:
-      try:
-        self.work = self.field._allowedValues ["%s" % self.value]
-      except KeyError:
-        self.work = ""
+        if self.field._allowedValues \
+                and "%s" % self.value in self.field._allowedValues:
+            self.work = self.field._allowedValues ["%s" % self.value]
+        else:
+            self.work = ""
 
     self._buildDisplay()