From cc504ab07c984b19a4e959656ffbd657ca80c949 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Wed, 31 Aug 2011 10:56:43 -0700 Subject: [PATCH] Fix pubsub get_items. - item_ids checked for None - pubsub node is set --- sleekxmpp/plugins/xep_0060/pubsub.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sleekxmpp/plugins/xep_0060/pubsub.py b/sleekxmpp/plugins/xep_0060/pubsub.py index 5a17dd5..a891573 100644 --- a/sleekxmpp/plugins/xep_0060/pubsub.py +++ b/sleekxmpp/plugins/xep_0060/pubsub.py @@ -355,12 +355,14 @@ class xep_0060(base_plugin): many items, so an iterator can be returned if needed. """ iq = self.xmpp.Iq(sto=jid, sfrom=ifrom, stype='get') + iq['pubsub']['items']['node'] = node iq['pubsub']['items']['max_items'] = max_items - for item_id in item_ids: - item = self.stanza.Item() - item['id'] = item_id - iq['pubsub']['items'].append(item) + if item_ids is not None: + for item_id in item_ids: + item = self.stanza.Item() + item['id'] = item_id + iq['pubsub']['items'].append(item) if iterator: return self.xmpp['xep_0059'].iterate(iq, 'pubsub')