diff options
| author | Nathan Fritz <fritzy@netflint.net> | 2010-02-15 21:44:50 -0800 |
|---|---|---|
| committer | Nathan Fritz <fritzy@netflint.net> | 2010-02-15 21:44:50 -0800 |
| commit | ed60867a63af204bbef350bb744c5923a389a2a8 (patch) | |
| tree | 142c45e988431f5f17a5a794c15c19dace4c2acb /sleekxmpp/plugins/xep_0060.py | |
| parent | 58375955a9b832356ba68cc1f9ecb3bc274b6922 (diff) | |
| parent | 0dcbe92d1e49a9f009b39c39150307e3c15c9f9b (diff) | |
| download | slixmpp-ed60867a63af204bbef350bb744c5923a389a2a8.tar.gz slixmpp-ed60867a63af204bbef350bb744c5923a389a2a8.tar.bz2 slixmpp-ed60867a63af204bbef350bb744c5923a389a2a8.tar.xz slixmpp-ed60867a63af204bbef350bb744c5923a389a2a8.zip | |
Merge branch 'develop'
Diffstat (limited to 'sleekxmpp/plugins/xep_0060.py')
| -rw-r--r-- | sleekxmpp/plugins/xep_0060.py | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/sleekxmpp/plugins/xep_0060.py b/sleekxmpp/plugins/xep_0060.py index 999b8197..cbc89df6 100644 --- a/sleekxmpp/plugins/xep_0060.py +++ b/sleekxmpp/plugins/xep_0060.py @@ -43,9 +43,9 @@ class xep_0060(base.base_plugin): iq = self.xmpp.makeIqSet(pubsub) iq.attrib['to'] = jid iq.attrib['from'] = self.xmpp.fulljid - id = iq.get('id') + id = iq['id'] result = self.xmpp.send(iq, "<iq id='%s'/>" % id) - if result is False or result is None or result.get('type') == 'error': return False + if result is False or result is None or result['type'] == 'error': return False return True def subscribe(self, jid, node, bare=True, subscribee=None): @@ -65,7 +65,7 @@ class xep_0060(base.base_plugin): iq.attrib['from'] = self.xmpp.fulljid id = iq['id'] result = self.xmpp.send(iq, "<iq id='%s'/>" % id) - if result is False or result is None or result.get('type') == 'error': return False + if result is False or result is None or result['type'] == 'error': return False return True def unsubscribe(self, jid, node, bare=True, subscribee=None): @@ -83,9 +83,9 @@ class xep_0060(base.base_plugin): iq = self.xmpp.makeIqSet(pubsub) iq.attrib['to'] = jid iq.attrib['from'] = self.xmpp.fulljid - id = iq.get('id') + id = iq['id'] result = self.xmpp.send(iq, "<iq id='%s'/>" % id) - if result is False or result is None or result.get('type') == 'error': return False + if result is False or result is None or result['type'] == 'error': return False return True def getNodeConfig(self, jid, node=None): # if no node, then grab default @@ -101,10 +101,10 @@ class xep_0060(base.base_plugin): iq.append(pubsub) iq.attrib['to'] = jid iq.attrib['from'] = self.xmpp.fulljid - id = iq.get('id') + id = iq['id'] #self.xmpp.add_handler("<iq id='%s'/>" % id, self.handlerCreateNodeResponse) result = self.xmpp.send(iq, "<iq id='%s'/>" % id) - if result is None or result == False or result.get('type') == 'error': + if result is None or result == False or result['type'] == 'error': logging.warning("got error instead of config") return False if node is not None: @@ -125,9 +125,9 @@ class xep_0060(base.base_plugin): iq.append(pubsub) iq.attrib['to'] = jid iq.attrib['from'] = self.xmpp.fulljid - id = iq.get('id') + id = iq['id'] result = self.xmpp.send(iq, "<iq id='%s'/>" % id) - if result is None or result == False or result.get('type') == 'error': + if result is None or result == False or result['type'] == 'error': logging.warning("got error instead of config") return False else: @@ -148,9 +148,9 @@ class xep_0060(base.base_plugin): iq.append(pubsub) iq.attrib['to'] = jid iq.attrib['from'] = self.xmpp.fulljid - id = iq.get('id') + id = iq['id'] result = self.xmpp.send(iq, "<iq id='%s'/>" % id) - if result is None or result == False or result.get('type') == 'error': + if result is None or result == False or result['type'] == 'error': logging.warning("got error instead of config") return False else: @@ -171,7 +171,7 @@ class xep_0060(base.base_plugin): iq.append(pubsub) iq.attrib['to'] = jid iq.attrib['from'] = self.xmpp.fulljid - id = iq.get('id') + id = iq['id'] result = self.xmpp.send(iq, "<iq id='%s'/>" % id) if result is not None and result is not False and result.attrib.get('type', 'error') != 'error': return True @@ -189,9 +189,9 @@ class xep_0060(base.base_plugin): iq = self.xmpp.makeIqSet(pubsub) iq.attrib['to'] = jid iq.attrib['from'] = self.xmpp.fulljid - id = iq.get('id') + id = iq['id'] result = self.xmpp.send(iq, "<iq id='%s'/>" % id) - if result is None or result.get('type') == 'error': + if result is None or result['type'] == 'error': return False return True @@ -210,9 +210,9 @@ class xep_0060(base.base_plugin): iq = self.xmpp.makeIqSet(pubsub) iq.attrib['to'] = jid iq.attrib['from'] = self.xmpp.fulljid - id = iq.get('id') + id = iq['id'] result = self.xmpp.send(iq, "<iq id='%s'/>" % id) - if result is None or result is False or result.get('type') == 'error': return False + if result is None or result is False or result['type'] == 'error': return False return True def deleteItem(self, jid, node, item): @@ -226,9 +226,9 @@ class xep_0060(base.base_plugin): iq = self.xmpp.makeIqSet(pubsub) iq.attrib['to'] = jid iq.attrib['from'] = self.xmpp.fulljid - id = iq.get('id') + id = iq['id'] result = self.xmpp.send(iq, "<iq id='%s'/>" % id) - if result is None or result is False or result.get('type') == 'error': return False + if result is None or result is False or result['type'] == 'error': return False return True def addItem(self, jid, node, items=[]): @@ -280,9 +280,9 @@ class xep_0060(base.base_plugin): iq = self.xmpp.makeIqSet(pubsub) iq.attrib['to'] = ps_jid iq.attrib['from'] = self.xmpp.fulljid - id = iq.get('id') + id = iq['id'] result = self.xmpp.send(iq, "<iq id='%s'/>" % id) - if result is None or result is False or result.get('type') == 'error': + if result is None or result is False or result['type'] == 'error': return False return True |