Changeset 51:d6bbf24ef053 for wokkel/data_form.py

Timestamp:

Jan 13, 2009, 7:30:35 PM (13 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Convert:

svn:b33ecbfc-034c-dc11-8662-000475d9059e/trunk@162

Message:

Address Data Form type checking issues.

Author: ralphm.
Reviewer: tofu.
Fixes #41.

File:

• wokkel/data_form.py (modified) (2 diffs)

wokkel/data_form.py

@@ -220 +220 @@
             for value in self.values:
                 if self.fieldType == 'boolean':
-                    # We send out the textual representation of boolean values
-                    value = bool(int(value))
+                    if isinstance(value, (str, unicode)):
+                        checkValue = value.lower()
+                        if not checkValue in ('0', '1', 'false', 'true'):
+                            raise ValueError("Not a boolean")
+                        value = checkValue in ('1', 'true')
+                    value = bool(value)
                 elif self.fieldType in ('jid-single', 'jid-multi'):
-                    value = value.full()
+                    if not hasattr(value, 'full'):
+                        value = JID(value)
 
                 newValues.append(value)
@@ -249 +254 @@
             if self.fieldType == 'boolean':
                 value = unicode(value).lower()
+            elif self.fieldType in ('jid-single', 'jid-multi'):
+                value = value.full()
+
             field.addElement('value', content=value)