Optional attributes always being set in dataforms.Option and dataforms.Field

[Stelminator@…]

dataforms.Option.label and dataforms.Field.type are optional as per JEP-0004

dataforms.py always attaches these attributes when building the xml.

patch below:

Index: pyxmpp/jabber/dataforms.py
===================================================================
--- pyxmpp/jabber/dataforms.py	(revision 661)
+++ pyxmpp/jabber/dataforms.py	(working copy)
@@ -70,7 +70,8 @@
             - `xmlnode`: `libxml2.xmlNode`
             - `doc`: `libxml2.xmlDoc`"""
         _unused = doc
-        xmlnode.setProp("label", self.label.encode("utf-8"))
+        if self.label is not None:
+            xmlnode.setProp("label", self.label.encode("utf-8"))
         for value in self.values:
             xmlnode.newTextChild(xmlnode.ns(), "value", value.encode("utf-8"))
         return xmlnode
@@ -259,7 +260,8 @@
             - `doc`: `libxml2.xmlDoc`"""
         if self.type is not None and self.type not in self.allowed_types:
             raise ValueError, "Invalid form field type: %r" % (self.type,)
-        xmlnode.setProp("type", self.type)
+        if self.type is not None:
+            xmlnode.setProp("type", self.type)
         if not self.label is None:
             xmlnode.setProp("label", self.label)
         if not self.name is None:

[impotence help with cialis]

Happiness isn't having what you want, it's wanting what you have. vendita viagra purchase fioricet buy Cialis and benedryl e3Bh1YI cialis cheap Cialis sales saturday delivery viagra foglietto illustrativo tramadol com

[Cialis hcl compared to lortab]

Let us not look back in anger or forward in fear, but around us in awareness.

-- James Thurber

ordinare viagra online fioricet prescription online buy Cialis side effects interactions D61r9ak cialis informazioni Cialis on line prescriptions viagra generico sicuro tramadol cheap