summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0050
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-06-08 10:01:52 -0700
committerLance Stout <lancestout@gmail.com>2011-06-08 10:01:52 -0700
commit8eb59072b4d5b88a0741e7ef7bb61fa357bffeae (patch)
tree37303e7a3bbc6e8a093ce3f9457e5a31c6822d8b /sleekxmpp/plugins/xep_0050
parent788a5b73f9392c49e1bab088d558ea4a337bea2d (diff)
parent4266ee0fa4b2520ed930047ea73d6ac82d9b1f83 (diff)
downloadslixmpp-8eb59072b4d5b88a0741e7ef7bb61fa357bffeae.tar.gz
slixmpp-8eb59072b4d5b88a0741e7ef7bb61fa357bffeae.tar.bz2
slixmpp-8eb59072b4d5b88a0741e7ef7bb61fa357bffeae.tar.xz
slixmpp-8eb59072b4d5b88a0741e7ef7bb61fa357bffeae.zip
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp/plugins/xep_0050')
-rw-r--r--sleekxmpp/plugins/xep_0050/adhoc.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0050/adhoc.py b/sleekxmpp/plugins/xep_0050/adhoc.py
index fe964e96..72c6c513 100644
--- a/sleekxmpp/plugins/xep_0050/adhoc.py
+++ b/sleekxmpp/plugins/xep_0050/adhoc.py
@@ -171,7 +171,7 @@ class xep_0050(base_plugin):
"""
if jid is None:
jid = self.xmpp.boundjid
- elif isinstance(jid, str):
+ elif not isinstance(jid, JID):
jid = JID(jid)
item_jid = jid.full