[gnue] r9067 - trunk/gnue-forms/src/GFObjects

[reinhard]

Author: reinhard
Date: 2006-11-27 04:29:10 -0600 (Mon, 27 Nov 2006)
New Revision: 9067

Modified:
   trunk/gnue-forms/src/GFObjects/GFField.py
Log:
Minor code cleanup.


Modified: trunk/gnue-forms/src/GFObjects/GFField.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFField.py   2006-11-27 10:21:23 UTC (rev 
9066)
+++ trunk/gnue-forms/src/GFObjects/GFField.py   2006-11-27 10:29:10 UTC (rev 
9067)
@@ -255,7 +255,7 @@
 
         db_value = '%s' % self.getValue()       # convert to string or unicode
 
-        if self._allowedValues.has_key(db_value):
+        if db_value in self._allowedValues:
             return self._allowedValues[db_value]
         else:
             # db returned value that is actually not allowed
@@ -269,10 +269,10 @@
         foreign key description.
         """
 
-        if self._allowedValuesReverse.has_key(value):
+        if value in self._allowedValuesReverse:
             self.setValue(self._allowedValuesReverse[value])
         else:
-            raise InvalidFieldValueError, (self.name, value)
+            raise InvalidFieldValueError(self.name, value)
 
     # -------------------------------------------------------------------------
     # Reading and writing the DB value of a field
@@ -437,12 +437,12 @@
         array = resultSet.getArray ([self.fk_key] + self._fk_descr)
 
         for line in array:
-          key = "%s" % line[0]
-          descr = dpSep.join (["%s" % i for i in line[1:]])
+            key = "%s" % line[0]
+            descr = dpSep.join (["%s" % i for i in line[1:]])
 
-          self._allowedValues[key] = descr
-          self._allowedValuesDescr.append(descr)
-          self._allowedValuesReverse[descr] = key
+            self._allowedValues[key] = descr
+            self._allowedValuesDescr.append(descr)
+            self._allowedValuesReverse[descr] = key
 
         # And now, position the resultSet to the correct record according to
         # the current field content.
@@ -494,11 +494,8 @@
 
     def __refresh_ui_choices(self):
 
-        choices = self._allowedValuesDescr[:]
-        choices.sort()
-
         for entry in self._entryList:
-            entry.refresh_ui_choices(choices)
+            entry.refresh_ui_choices(self._allowedValuesDescr)
 
 
     # =========================================================================