jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ordering fixes for Python3.3

Browse Source
This commit is contained in:
Lance Stout 2012-06-19 18:19:44 -07:00
parent 019a4b20ae
commit 36c11ad9de
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sleekxmpp/plugins/xep_0050/stanza.py
View File

@ -110,14 +110,14 @@ class Command(ElementBase):
""" """
Return the set of allowable next actions. Return the set of allowable next actions.
""" """
actions = [] actions = set()
actions_xml = self.find('{%s}actions' % self.namespace) actions_xml = self.find('{%s}actions' % self.namespace)
if actions_xml is not None: if actions_xml is not None:
for action in self.next_actions: for action in self.next_actions:
action_xml = actions_xml.find('{%s}%s' % (self.namespace, action_xml = actions_xml.find('{%s}%s' % (self.namespace,
action)) action))
if action_xml is not None: if action_xml is not None:
actions.append(action) actions.add(action)
return actions return actions
def del_actions(self): def del_actions(self):

2
sleekxmpp/plugins/xep_0059/stanza.py
View File

@ -74,7 +74,7 @@ class Set(ElementBase):
if fi is not None: if fi is not None:
if val: if val:
fi.attrib['index'] = val fi.attrib['index'] = val
else: elif 'index' in fi.attrib:
del fi.attrib['index'] del fi.attrib['index']
elif val: elif val:
fi = ET.Element("{%s}first" % (self.namespace)) fi = ET.Element("{%s}first" % (self.namespace))

2
tests/test_stanza_xep_0050.py
View File

@ -49,7 +49,7 @@ class TestAdHocCommandStanzas(SleekTest):
iq['command']['actions'] = ['prev', 'next'] iq['command']['actions'] = ['prev', 'next']
results = iq['command']['actions'] results = iq['command']['actions']
expected = ['prev', 'next'] expected = set(['prev', 'next'])
self.assertEqual(results, expected, self.assertEqual(results, expected,
"Incorrect next actions: %s" % results) "Incorrect next actions: %s" % results)