summaryrefslogtreecommitdiff
path: root/slixmpp/plugins/xep_0054/vcard_temp.py
diff options
context:
space:
mode:
Diffstat (limited to 'slixmpp/plugins/xep_0054/vcard_temp.py')
-rw-r--r--slixmpp/plugins/xep_0054/vcard_temp.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/slixmpp/plugins/xep_0054/vcard_temp.py b/slixmpp/plugins/xep_0054/vcard_temp.py
index 41849e60..85736b29 100644
--- a/slixmpp/plugins/xep_0054/vcard_temp.py
+++ b/slixmpp/plugins/xep_0054/vcard_temp.py
@@ -15,7 +15,7 @@ from slixmpp.xmlstream.handler import Callback
from slixmpp.xmlstream.matcher import StanzaPath
from slixmpp.plugins import BasePlugin
from slixmpp.plugins.xep_0054 import VCardTemp, stanza
-from slixmpp import coroutine_wrapper
+from slixmpp import future_wrapper
log = logging.getLogger(__name__)
@@ -60,9 +60,9 @@ class XEP_0054(BasePlugin):
def make_vcard(self):
return VCardTemp()
- @coroutine_wrapper
+ @future_wrapper
def get_vcard(self, jid=None, ifrom=None, local=None, cached=False,
- callback=None, timeout=None, coroutine=False):
+ callback=None, timeout=None):
if local is None:
if jid is not None and not isinstance(jid, JID):
jid = JID(jid)
@@ -101,11 +101,11 @@ class XEP_0054(BasePlugin):
iq['type'] = 'get'
iq.enable('vcard_temp')
- return iq.send(callback=callback, timeout=timeout, coroutine=coroutine)
+ return iq.send(callback=callback, timeout=timeout)
- @coroutine_wrapper
+ @future_wrapper
def publish_vcard(self, vcard=None, jid=None, ifrom=None,
- callback=None, timeout=None, coroutine=False):
+ callback=None, timeout=None):
self.api['set_vcard'](jid, None, ifrom, vcard)
if self.xmpp.is_component:
return
@@ -115,7 +115,7 @@ class XEP_0054(BasePlugin):
iq['from'] = ifrom
iq['type'] = 'set'
iq.append(vcard)
- return iq.send(callback=callback, timeout=timeout, coroutine=coroutine)
+ return iq.send(callback=callback, timeout=timeout)
def _handle_get_vcard(self, iq):
if iq['type'] == 'result':