summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-01-16 23:06:41 -0800
committerLance Stout <lancestout@gmail.com>2013-01-16 23:06:41 -0800
commit64ef6904320d6dd4dbdf4f9418a1dd054163899a (patch)
tree0c86039f5036313daece4d1f630f9d9b100d4b46
parent01da222d67858ac82951a0a3b01670ea201abd9c (diff)
parent41991b5982e6cfc9015eaf00663348ca6d4d3b2d (diff)
downloadslixmpp-64ef6904320d6dd4dbdf4f9418a1dd054163899a.tar.gz
slixmpp-64ef6904320d6dd4dbdf4f9418a1dd054163899a.tar.bz2
slixmpp-64ef6904320d6dd4dbdf4f9418a1dd054163899a.tar.xz
slixmpp-64ef6904320d6dd4dbdf4f9418a1dd054163899a.zip
Merge branch 'master' into develop
-rw-r--r--sleekxmpp/plugins/xep_0153/vcard_avatar.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0153/vcard_avatar.py b/sleekxmpp/plugins/xep_0153/vcard_avatar.py
index 03106247..00122181 100644
--- a/sleekxmpp/plugins/xep_0153/vcard_avatar.py
+++ b/sleekxmpp/plugins/xep_0153/vcard_avatar.py
@@ -87,7 +87,7 @@ class XEP_0153(BasePlugin):
new_hash = hashlib.sha1(data).hexdigest()
self.api['set_hash'](self.xmpp.boundjid, args=new_hash)
except XMPPError:
- log.debug('Could not retrieve vCard for %s' % jid)
+ log.debug('Could not retrieve vCard for %s' % self.xmpp.boundjid.bare)
self._allow_advertising.set()