[gnue] r8640 - branches/forms-0.5/src/GFObjects

[johannes]

Author: johannes
Date: 2006-08-28 11:29:15 -0500 (Mon, 28 Aug 2006)
New Revision: 8640

Modified:
   branches/forms-0.5/src/GFObjects/GFBlock.py
   branches/forms-0.5/src/GFObjects/GFField.py
Log:
Further improvement for non-string keys


Modified: branches/forms-0.5/src/GFObjects/GFBlock.py
===================================================================
--- branches/forms-0.5/src/GFObjects/GFBlock.py 2006-08-27 17:05:00 UTC (rev 
8639)
+++ branches/forms-0.5/src/GFObjects/GFBlock.py 2006-08-28 16:29:15 UTC (rev 
8640)
@@ -890,7 +890,7 @@
           for field in fields:
               fname = field.field
               if hasattr(field, 'fk_source'):
-                  value = field._allowedValues.get(r[fname])
+                  value = field._allowedValues.get("%s" % r[fname])
               else:
                   value = r[fname]
 

Modified: branches/forms-0.5/src/GFObjects/GFField.py
===================================================================
--- branches/forms-0.5/src/GFObjects/GFField.py 2006-08-27 17:05:00 UTC (rev 
8639)
+++ branches/forms-0.5/src/GFObjects/GFField.py 2006-08-28 16:29:15 UTC (rev 
8640)
@@ -390,7 +390,7 @@
     if self._allowedValues is None:
       return None
 
-    return self._allowedValues.get(str(self.getValue()))
+    return self._allowedValues.get("%s" % self.getValue())
 
 
   # ---------------------------------------------------------------------------