From d8c96623022835dece47e499245369aa68927300 Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Thu, 14 Feb 2013 01:24:09 -0800
Subject: Resolve most Python3.3 related issues.

Tests now run successfully. Occasionally get single error related to
duplicated payload data in pubsub items when copying stanza values.
---
 sleekxmpp/plugins/xep_0004/stanza/field.py |  5 +++--
 sleekxmpp/plugins/xep_0004/stanza/form.py  | 12 +++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'sleekxmpp/plugins/xep_0004/stanza')

diff --git a/sleekxmpp/plugins/xep_0004/stanza/field.py b/sleekxmpp/plugins/xep_0004/stanza/field.py
index 1e175966..51f85995 100644
--- a/sleekxmpp/plugins/xep_0004/stanza/field.py
+++ b/sleekxmpp/plugins/xep_0004/stanza/field.py
@@ -41,10 +41,11 @@ class FormField(ElementBase):
             self._type = value
 
     def add_option(self, label='', value=''):
-        if self._type in self.option_types:
-            opt = FieldOption(parent=self)
+        if self._type is None or self._type in self.option_types:
+            opt = FieldOption()
             opt['label'] = label
             opt['value'] = value
+            self.append(opt)
         else:
             raise ValueError("Cannot add options to " + \
                              "a %s field." % self['type'])
diff --git a/sleekxmpp/plugins/xep_0004/stanza/form.py b/sleekxmpp/plugins/xep_0004/stanza/form.py
index 721ecc35..bbd8540f 100644
--- a/sleekxmpp/plugins/xep_0004/stanza/form.py
+++ b/sleekxmpp/plugins/xep_0004/stanza/form.py
@@ -65,7 +65,7 @@ class Form(ElementBase):
         if kwtype is None:
             kwtype = ftype
 
-        field = FormField(parent=self)
+        field = FormField()
         field['var'] = var
         field['type'] = kwtype
         field['value'] = value
@@ -77,6 +77,7 @@ class Form(ElementBase):
                 field['options'] = options
         else:
             del field['type']
+        self.append(field)
         return field
 
     def getXML(self, type='submit'):
@@ -144,10 +145,9 @@ class Form(ElementBase):
 
     def get_fields(self, use_dict=False):
         fields = OrderedDict()
-        fieldsXML = self.xml.findall('{%s}field' % FormField.namespace)
-        for fieldXML in fieldsXML:
-            field = FormField(xml=fieldXML)
-            fields[field['var']] = field
+        for stanza in self['substanzas']:
+            if isinstance(stanza, FormField):
+                fields[stanza['var']] = stanza
         return fields
 
     def get_instructions(self):
@@ -221,6 +221,8 @@ class Form(ElementBase):
     def set_values(self, values):
         fields = self['fields']
         for field in values:
+            if field not in fields:
+                fields[field] = self.add_field(var=field)
             fields[field]['value'] = values[field]
 
     def merge(self, other):
-- 
cgit v1.2.3