From 62230fc970f86b11bc74ee448e30cbe93f477e72 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Wed, 17 Aug 2011 21:22:03 -0700 Subject: Return '' instead of None from form fields with no values. --- sleekxmpp/plugins/xep_0004/stanza/field.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sleekxmpp/plugins/xep_0004/stanza/field.py b/sleekxmpp/plugins/xep_0004/stanza/field.py index 43293bfd..8131233c 100644 --- a/sleekxmpp/plugins/xep_0004/stanza/field.py +++ b/sleekxmpp/plugins/xep_0004/stanza/field.py @@ -85,7 +85,7 @@ class FormField(ElementBase): return None elif self._type == 'boolean': return valsXML[0].text in self.true_values - elif self._type in self.multi_value_types: + elif self._type in self.multi_value_types or len(valsXML) > 1: values = [] for valXML in valsXML: if valXML.text is None: @@ -95,6 +95,8 @@ class FormField(ElementBase): values = "\n".join(values) return values else: + if valsXML[0].text is None: + return '' return valsXML[0].text def set_answer(self, answer): -- cgit v1.2.3