summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-06-19 18:19:44 -0700
committerLance Stout <lancestout@gmail.com>2012-06-19 18:19:44 -0700
commit36c11ad9de7c1b5a199aa5a4302e33085513c126 (patch)
treedac968912daac31694f79b3a7926f6527b981cda /sleekxmpp
parent019a4b20ae5284ec07d4ecc5e5136be5012e88bd (diff)
downloadslixmpp-36c11ad9de7c1b5a199aa5a4302e33085513c126.tar.gz
slixmpp-36c11ad9de7c1b5a199aa5a4302e33085513c126.tar.bz2
slixmpp-36c11ad9de7c1b5a199aa5a4302e33085513c126.tar.xz
slixmpp-36c11ad9de7c1b5a199aa5a4302e33085513c126.zip
Ordering fixes for Python3.3
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/plugins/xep_0050/stanza.py4
-rw-r--r--sleekxmpp/plugins/xep_0059/stanza.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/sleekxmpp/plugins/xep_0050/stanza.py b/sleekxmpp/plugins/xep_0050/stanza.py
index 31a4a5d5..2367c77b 100644
--- a/sleekxmpp/plugins/xep_0050/stanza.py
+++ b/sleekxmpp/plugins/xep_0050/stanza.py
@@ -110,14 +110,14 @@ class Command(ElementBase):
"""
Return the set of allowable next actions.
"""
- actions = []
+ actions = set()
actions_xml = self.find('{%s}actions' % self.namespace)
if actions_xml is not None:
for action in self.next_actions:
action_xml = actions_xml.find('{%s}%s' % (self.namespace,
action))
if action_xml is not None:
- actions.append(action)
+ actions.add(action)
return actions
def del_actions(self):
diff --git a/sleekxmpp/plugins/xep_0059/stanza.py b/sleekxmpp/plugins/xep_0059/stanza.py
index 7fad4636..48f5c8a0 100644
--- a/sleekxmpp/plugins/xep_0059/stanza.py
+++ b/sleekxmpp/plugins/xep_0059/stanza.py
@@ -74,7 +74,7 @@ class Set(ElementBase):
if fi is not None:
if val:
fi.attrib['index'] = val
- else:
+ elif 'index' in fi.attrib:
del fi.attrib['index']
elif val:
fi = ET.Element("{%s}first" % (self.namespace))