diff options
author | mathieui <mathieui@mathieui.net> | 2015-02-28 13:22:19 +0100 |
---|---|---|
committer | mathieui <mathieui@mathieui.net> | 2015-02-28 19:02:49 +0100 |
commit | 997928de9140a4ac0a10a42883dbf18aca4aeec6 (patch) | |
tree | 4cd83ac161b4da491159412c95c84e9f0db41135 /slixmpp/plugins/xep_0084 | |
parent | 83d00a5913e6b7ef71de602e793b3973866c7120 (diff) | |
download | slixmpp-997928de9140a4ac0a10a42883dbf18aca4aeec6.tar.gz slixmpp-997928de9140a4ac0a10a42883dbf18aca4aeec6.tar.bz2 slixmpp-997928de9140a4ac0a10a42883dbf18aca4aeec6.tar.xz slixmpp-997928de9140a4ac0a10a42883dbf18aca4aeec6.zip |
Revert or edit most previous XEP plugin changes
In a single commit, because it isn’t that interesting to detail each
change.
List of reverts:
Revert "XEP-0030: allow get_info and get_items to return a coroutine"
This reverts commit 506ca6991790cffb90c5b6e3b765237ccc136e1a.
Revert "XEP-0060: wrap all iq-sending functions with coroutine_wrapper"
This reverts commit e85fa4203e0ee7108d8d37f73913c21628e3d6fc.
Revert "XEP-0163: wrap publish() with coroutine_wrapper"
This reverts commit 69da1c1d7cf7a1c0dbbeeb83f528b4e5f5b5be0c.
Revert "XEP-0084: wrap functions with coroutine_wrapper"
This reverts commit ea5615f236bd80fb4217398977833ca790cbef71.
Partially revert 3d243f7 (XEP-0054) - continue wrapping functions but with future_wrapper
Partially revert 115fe95 (xep-0153) - use callbacks rather than coroutine callbacks, and propagate iqtimeouts in set_avatar.
Revert "XEP-0049: wrap functions with coroutine_wrapper"
This reverts commit e68135f59f9a224688679eb91e8063041d6f000b.
Revert "XEP-0077: wrap functions with coroutine_wrapper"
This reverts commit 1e4944d47e8296fdaa792a8b3fc87ea99acc217c.
Partially revert cd7ff685 (XEP-0199) - remove the iq.send wrapping but keep ping() as a coroutine
Revert "XEP-0257: wrap functions with coroutine_wrapper"
This reverts commit 4da870fd191697d010e677eee32ef86439967353.
Revert "XEP-0092: wrap get_version() with coroutine_wrapper"
This reverts commit 6e35948276c36ea2696f0de64dc179a1073ee3a6.
Revert "XEP-0191: wrap functions with coroutine_wrapper"
This reverts commit 6e8235544cc1bdefea75a8d93e5e3a48a13552ba.
Revert "XEP-0280: wrap functions with coroutine_wrapper"
This reverts commit f795ac02e322445be13077463638924d1f22d313.
Revert "XEP-0012: wrap get_last_activity() with coroutine_wrapper"
This reverts commit 2ee05d9616d2959d19a7a87d21c58e6aae1db56e.
Revert "XEP-0202: wrap get_entity_time() with coroutine_wrapper"
This reverts commit 6fb3ecd414f24374f17811d7ad2fd01e4924e311.
Revert "XEP-0231: wrap get_bob() with coroutine_wrapper"
This reverts commit 17464b10a42d9b3c4daba763e06e53c429478abd.
Revert "XEP-0258: wrap get_catalog() with coroutine_wrapper"
This reverts commit 18a4978456a33e6ea38de1e07b1aa43bcc10d45f.
Revert "XEP-0050: wrap send_command() and get_commands() with coroutine_wrapper"
This reverts commit e034b31d6bc34f43578456e9c6527bc56dff78e3.
Revert "XEP-0279: wrap check_ip() with coroutine_wrapper"
This reverts commit e112e864756f1222a044ee28e3c13c5925618b0c.
Diffstat (limited to 'slixmpp/plugins/xep_0084')
-rw-r--r-- | slixmpp/plugins/xep_0084/avatar.py | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/slixmpp/plugins/xep_0084/avatar.py b/slixmpp/plugins/xep_0084/avatar.py index 9216bdf0..2bae765a 100644 --- a/slixmpp/plugins/xep_0084/avatar.py +++ b/slixmpp/plugins/xep_0084/avatar.py @@ -15,7 +15,6 @@ from slixmpp.xmlstream.handler import Callback from slixmpp.xmlstream.matcher import StanzaPath from slixmpp.xmlstream import register_stanza_plugin, JID from slixmpp.plugins.xep_0084 import stanza, Data, MetaData -from slixmpp import coroutine_wrapper log = logging.getLogger(__name__) @@ -45,30 +44,26 @@ class XEP_0084(BasePlugin): def generate_id(self, data): return hashlib.sha1(data).hexdigest() - @coroutine_wrapper - def retrieve_avatar(self, jid, id, url=None, ifrom=None, callback=None, - timeout=None, coroutine=False): + def retrieve_avatar(self, jid, id, url=None, ifrom=None, + callback=None, timeout=None): return self.xmpp['xep_0060'].get_item(jid, Data.namespace, id, - ifrom=ifrom, callback=callback, - timeout=timeout, - coroutine=coroutine) + ifrom=ifrom, + callback=callback, + timeout=timeout) - @coroutine_wrapper def publish_avatar(self, data, ifrom=None, callback=None, - timeout=None, coroutine=False): + timeout=None): payload = Data() payload['value'] = data return self.xmpp['xep_0163'].publish(payload, id=self.generate_id(data), ifrom=ifrom, callback=callback, - timeout=timeout, - coroutine=coroutine) + timeout=timeout) - @coroutine_wrapper def publish_avatar_metadata(self, items=None, pointers=None, - ifrom=None, callback=None, timeout=None, - coroutine=False): + ifrom=None, + callback=None, timeout=None): metadata = MetaData() if items is None: items = [] @@ -88,11 +83,9 @@ class XEP_0084(BasePlugin): id=info['id'], ifrom=ifrom, callback=callback, - timeout=timeout, - coroutine=coroutine) + timeout=timeout) - @coroutine_wrapper - def stop(self, ifrom=None, callback=None, timeout=None, coroutine=False): + def stop(self, ifrom=None, callback=None, timeout=None): """ Clear existing avatar metadata information to stop notifications. @@ -109,5 +102,4 @@ class XEP_0084(BasePlugin): node=MetaData.namespace, ifrom=ifrom, callback=callback, - timeout=timeout, - coroutine=coroutine) + timeout=timeout) |