summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorNathan Fritz <fritzy@netflint.net>2010-01-29 23:58:14 -0800
committerNathan Fritz <fritzy@netflint.net>2010-01-29 23:58:14 -0800
commit06fa1fcf332c9e0623dff90db8d1daacdfac87f1 (patch)
treeff4466691117e0fee66add9d98f2edd378e55236 /sleekxmpp/plugins
parent4d8709859096699ad79b8fce295ab05f2cb31de2 (diff)
parent5e736f4b978414c111062ffb220e38eb40765db6 (diff)
downloadslixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.tar.gz
slixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.tar.bz2
slixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.tar.xz
slixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.zip
Merge branch 'develop'
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/xep_0060.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0060.py b/sleekxmpp/plugins/xep_0060.py
index 837d0ad4..999b8197 100644
--- a/sleekxmpp/plugins/xep_0060.py
+++ b/sleekxmpp/plugins/xep_0060.py
@@ -63,7 +63,7 @@ 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
return True