diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-06-19 01:29:48 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-06-19 01:29:48 -0700 |
| commit | d92aa05b5c18806ab5addc947eeedaaf4d51500e (patch) | |
| tree | bdb64fa72894b6689b38fa6e96a29e15548422fd /sleekxmpp/plugins/xep_0153 | |
| parent | f7a74d960edb3ced00423c081ec74e9e91f3aea2 (diff) | |
| download | slixmpp-d92aa05b5c18806ab5addc947eeedaaf4d51500e.tar.gz slixmpp-d92aa05b5c18806ab5addc947eeedaaf4d51500e.tar.bz2 slixmpp-d92aa05b5c18806ab5addc947eeedaaf4d51500e.tar.xz slixmpp-d92aa05b5c18806ab5addc947eeedaaf4d51500e.zip | |
PEP8 formatting updates.
Diffstat (limited to 'sleekxmpp/plugins/xep_0153')
| -rw-r--r-- | sleekxmpp/plugins/xep_0153/vcard_avatar.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sleekxmpp/plugins/xep_0153/vcard_avatar.py b/sleekxmpp/plugins/xep_0153/vcard_avatar.py index 2cc2f15a..3f36d135 100644 --- a/sleekxmpp/plugins/xep_0153/vcard_avatar.py +++ b/sleekxmpp/plugins/xep_0153/vcard_avatar.py @@ -45,7 +45,7 @@ class XEP_0153(BasePlugin): self.api.register(self._set_hash, 'set_hash', default=True) self.api.register(self._get_hash, 'get_hash', default=True) - def set_avatar(self, jid=None, avatar=None, mtype=None, block=True, + def set_avatar(self, jid=None, avatar=None, mtype=None, block=True, timeout=None, callback=None): vcard = self.xmpp['xep_0054'].get_vcard(jid, cached=True) vcard = vcard['vcard_temp'] @@ -69,7 +69,7 @@ class XEP_0153(BasePlugin): own_jid = (jid.bare == self.xmpp.boundjid.bare) if self.xmpp.is_component: own_jid = (jid.domain == self.xmpp.boundjid.domain) - + if jid is not None: jid = jid.bare self.api['set_hash'](jid, args=None) @@ -77,7 +77,7 @@ class XEP_0153(BasePlugin): self.xmpp.roster[jid].send_last_presence() iq = self.xmpp['xep_0054'].get_vcard( - jid=jid, + jid=jid, ifrom=self.xmpp.boundjid) data = iq['vcard_temp']['PHOTO']['BINVAL'] if not data: |