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_0231 | |
| 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_0231')
| -rw-r--r-- | sleekxmpp/plugins/xep_0231/__init__.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0231/bob.py | 7 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0231/stanza.py | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sleekxmpp/plugins/xep_0231/__init__.py b/sleekxmpp/plugins/xep_0231/__init__.py index 6a70cc07..2861d67b 100644 --- a/sleekxmpp/plugins/xep_0231/__init__.py +++ b/sleekxmpp/plugins/xep_0231/__init__.py @@ -1,6 +1,6 @@ """ SleekXMPP: The Sleek XMPP Library - Copyright (C) 2012 Nathanael C. Fritz, + Copyright (C) 2012 Nathanael C. Fritz, Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> This file is part of SleekXMPP. diff --git a/sleekxmpp/plugins/xep_0231/bob.py b/sleekxmpp/plugins/xep_0231/bob.py index 011a1952..f411a8f7 100644 --- a/sleekxmpp/plugins/xep_0231/bob.py +++ b/sleekxmpp/plugins/xep_0231/bob.py @@ -1,6 +1,6 @@ """ SleekXMPP: The Sleek XMPP Library - Copyright (C) 2012 Nathanael C. Fritz, + Copyright (C) 2012 Nathanael C. Fritz, Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> This file is part of SleekXMPP. @@ -58,7 +58,6 @@ class XEP_0231(BasePlugin): self.api.register(self._set_bob, 'set_bob', default=True) self.api.register(self._del_bob, 'del_bob', default=True) - def set_bob(self, data, mtype, cid=None, max_age=None): if cid is None: cid = 'sha1+%s@bob.xmpp.org' % hashlib.sha1(data).hexdigest() @@ -73,7 +72,7 @@ class XEP_0231(BasePlugin): return cid - def get_bob(self, jid=None, cid=None, cached=True, ifrom=None, + def get_bob(self, jid=None, cid=None, cached=True, ifrom=None, block=True, timeout=None, callback=None): if cached: data = self.api['get_bob'](None, None, ifrom, args=cid) @@ -112,7 +111,7 @@ class XEP_0231(BasePlugin): iq.send() def _handle_bob(self, stanza): - self.api['set_bob'](stanza['from'], None, + self.api['set_bob'](stanza['from'], None, stanza['to'], args=stanza['bob']) self.xmpp.event('bob', stanza) diff --git a/sleekxmpp/plugins/xep_0231/stanza.py b/sleekxmpp/plugins/xep_0231/stanza.py index 13d7a5db..a51f5a03 100644 --- a/sleekxmpp/plugins/xep_0231/stanza.py +++ b/sleekxmpp/plugins/xep_0231/stanza.py @@ -1,6 +1,6 @@ """ SleekXMPP: The Sleek XMPP Library - Copyright (C) 2012 Nathanael C. Fritz, + Copyright (C) 2012 Nathanael C. Fritz, Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> This file is part of SleekXMPP. |