summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2014-08-21 10:05:42 -0700
committerLance Stout <lancestout@gmail.com>2014-08-21 10:05:42 -0700
commitaabec8b993748866b9cf3f09ebb7ae7ce2ddc426 (patch)
tree94c4fb419567f86ca62db5ad936ce00505891081
parente5e2fbb16b4d9c11fc676925c6a13943282a3c66 (diff)
downloadslixmpp-aabec8b993748866b9cf3f09ebb7ae7ce2ddc426.tar.gz
slixmpp-aabec8b993748866b9cf3f09ebb7ae7ce2ddc426.tar.bz2
slixmpp-aabec8b993748866b9cf3f09ebb7ae7ce2ddc426.tar.xz
slixmpp-aabec8b993748866b9cf3f09ebb7ae7ce2ddc426.zip
Fix some more Unicode in **kwargs issues in Py2.6
-rw-r--r--sleekxmpp/plugins/xep_0004/stanza/form.py9
-rw-r--r--sleekxmpp/xmlstream/stanzabase.py7
2 files changed, 15 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0004/stanza/form.py b/sleekxmpp/plugins/xep_0004/stanza/form.py
index bbd8540f..f51e7f09 100644
--- a/sleekxmpp/plugins/xep_0004/stanza/form.py
+++ b/sleekxmpp/plugins/xep_0004/stanza/form.py
@@ -195,7 +195,14 @@ class Form(ElementBase):
fields = fields.items()
for var, field in fields:
field['var'] = var
- self.add_field(**field)
+ self.add_field(
+ var = field.get('var'),
+ label = field.get('label'),
+ desc = field.get('desc'),
+ required = field.get('required'),
+ value = field.get('value'),
+ options = field.get('options'),
+ type = field.get('type'))
def set_instructions(self, instructions):
del self['instructions']
diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py
index c6ed4163..11c8dd67 100644
--- a/sleekxmpp/xmlstream/stanzabase.py
+++ b/sleekxmpp/xmlstream/stanzabase.py
@@ -19,6 +19,7 @@ import logging
import weakref
from xml.etree import cElementTree as ET
+from sleekxmpp.util import safedict
from sleekxmpp.xmlstream import JID
from sleekxmpp.xmlstream.tostring import tostring
from sleekxmpp.thirdparty import OrderedDict
@@ -679,6 +680,8 @@ class ElementBase(object):
if lang and attrib in self.lang_interfaces:
kwargs['lang'] = lang
+ kwargs = safedict(kwargs)
+
if attrib == 'substanzas':
return self.iterables
elif attrib in self.interfaces or attrib == 'lang':
@@ -755,6 +758,8 @@ class ElementBase(object):
if lang and attrib in self.lang_interfaces:
kwargs['lang'] = lang
+ kwargs = safedict(kwargs)
+
if attrib in self.interfaces or attrib == 'lang':
if value is not None:
set_method = "set_%s" % attrib.lower()
@@ -841,6 +846,8 @@ class ElementBase(object):
if lang and attrib in self.lang_interfaces:
kwargs['lang'] = lang
+ kwargs = safedict(kwargs)
+
if attrib in self.interfaces or attrib == 'lang':
del_method = "del_%s" % attrib.lower()
del_method2 = "del%s" % attrib.title()