summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conn_tests/test_pubsubserver.py11
-rw-r--r--sleekxmpp/plugins/xep_0060.py9
2 files changed, 9 insertions, 11 deletions
diff --git a/conn_tests/test_pubsubserver.py b/conn_tests/test_pubsubserver.py
index 25d84d40..9fd3bd8f 100644
--- a/conn_tests/test_pubsubserver.py
+++ b/conn_tests/test_pubsubserver.py
@@ -110,14 +110,13 @@ class TestPubsubServer(unittest.TestCase):
def test011createcollectionnode(self):
"Create a collection node"
- self.failUnless(self.xmpp1['xep_0060'].create_node(self.pshost, "testnode3", self.statev['defaultconfig'], True))
+ self.failUnless(self.xmpp1['xep_0060'].create_node(self.pshost, "testnode3", self.statev['defaultconfig'], True), "Could not create collection node")
-
- def test999cleanup(self):
+ def test900cleanup(self):
"Cleaning up"
- self.failUnless(self.xmpp1['xep_0060'].deleteNode(self.pshost, 'testnode5'), "Could not delete test node.")
- self.failUnless(self.xmpp1['xep_0060'].deleteNode(self.pshost, 'testnode3'), "Could not delete collection test node.")
-
+ self.failUnless(self.xmpp1['xep_0060'].deleteNode(self.pshost, 'testnode2'), "Could not delete test node.")
+ self.failUnless(self.xmpp1['xep_0060'].deleteNode(self.pshost, 'testnode3'), "Could not delete collection node")
+
if __name__ == '__main__':
#parse command line arguements
diff --git a/sleekxmpp/plugins/xep_0060.py b/sleekxmpp/plugins/xep_0060.py
index ea75a7d6..44a70e9a 100644
--- a/sleekxmpp/plugins/xep_0060.py
+++ b/sleekxmpp/plugins/xep_0060.py
@@ -172,9 +172,8 @@ class xep_0060(base.base_plugin):
iq.append(pubsub)
iq.attrib['to'] = jid
iq.attrib['from'] = self.xmpp.fulljid
- id = iq['id']
result = iq.send()
- if result is not None and result is not False and result.attrib.get('type', 'error') != 'error':
+ if result is not None and result is not False and result['type'] != 'error':
return True
else:
return False
@@ -216,6 +215,9 @@ class xep_0060(base.base_plugin):
if result is None or result is False or result['type'] == 'error': return False
return True
+ def addItem(self, jid, node, items=[]):
+ return self.setItem(jid, node, items)
+
def deleteItem(self, jid, node, item):
pubsub = ET.Element('{http://jabber.org/protocol/pubsub}pubsub')
retract = ET.Element('retract')
@@ -232,9 +234,6 @@ class xep_0060(base.base_plugin):
if result is None or result is False or result['type'] == 'error': return False
return True
- def addItem(self, jid, node, items=[]):
- return setItem(jid, node, items)
-
def getNodes(self, jid):
response = self.xmpp.plugin['xep_0030'].getItems(jid)
items = response.findall('{http://jabber.org/protocol/disco#items}query/{http://jabber.org/protocol/disco#items}item')