1 files changed, 23 insertions, 11 deletions
diff --git a/sleekxmpp/plugins/xep_0122/stanza.py b/sleekxmpp/plugins/xep_0122/stanza.py
index bf8545c8..bc3c177a 100644
--- a/sleekxmpp/plugins/xep_0122/stanza.py
+++ b/sleekxmpp/plugins/xep_0122/stanza.py
@@ -13,13 +13,17 @@ class FormValidation(ElementBase):
                 datatype='xs:dateTime'/>
       <value>2003-10-06T11:22:00-07:00</value>
     </field>
+
+    Questions:
+      Should this look at the datatype value and convert the range values as appropriate?
+      Should this stanza provide a pass/fail for a value from the field, or convert field value to datatype?
     """
 
     namespace = 'http://jabber.org/protocol/xdata-validate'
     name = 'validate'
     plugin_attrib = 'validate'
-    interfaces = set(('datatype', 'basic', 'open', 'range', 'regex', ))
-    sub_interfaces = set(('basic', 'open', 'range', 'regex', ))
+    interfaces = {'datatype', 'basic', 'open', 'range', 'regex', }
+    sub_interfaces = {'basic', 'open', 'range', 'regex', }
     plugin_attrib_map = {}
     plugin_tag_map = {}
 
@@ -33,22 +37,28 @@ class FormValidation(ElementBase):
         if value:
             self._add_field('basic')
         else:
-            self['basic'] = False
+            del self['basic']
 
     def set_open(self, value):
         if value:
             self._add_field('open')
+        else:
+            del self['open']
 
     def set_regex(self, regex):
         if regex:
             _regex = self._add_field('regex')
             _regex.text = regex
+        else:
+            del self['regex']
 
     def set_range(self, value, minimum=None, maximum=None):
         if value:
             _range = self._add_field('range')
             _range.attrib['min'] = str(minimum)
             _range.attrib['max'] = str(maximum)
+        else:
+            del self['range']
 
     def remove_all(self, except_tag=None):
         for a in self.sub_interfaces:
@@ -65,18 +75,20 @@ class FormValidation(ElementBase):
 
     def get_regex(self):
         present = self.xml.find('{%s}regex' % self.namespace)
-        if present:
+        if present is not None:
             return present.text
 
         return False
 
     def get_range(self):
-        present = self.xml.find('{%s}regex' % self.namespace)
-        if present:
-            return dict(present.attrib)
+        present = self.xml.find('{%s}range' % self.namespace)
+        if present is not None:
+            attributes = present.attrib
+            return_value = dict()
+            if 'min' in attributes:
+                return_value['minimum'] = attributes['min']
+            if 'max' in attributes:
+                return_value['maximum'] = attributes['max']
+            return return_value
 
         return False
-
-
-FormValidation.getBasic = FormValidation.get_basic
-FormValidation.setBasic = FormValidation.set_basic