summaryrefslogtreecommitdiff
path: root/slixmpp/roster
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2014-08-01 15:02:54 +0200
committerFlorent Le Coz <louiz@louiz.org>2014-08-01 15:02:54 +0200
commit07e46837d9da11ce41ea18a5276bfe740aa8dfbc (patch)
tree9667459e59db49b9a321830f56a28c0085d34581 /slixmpp/roster
parentfa21e262c77ccabceedc279d2f0b3650a60a1023 (diff)
downloadslixmpp-07e46837d9da11ce41ea18a5276bfe740aa8dfbc.tar.gz
slixmpp-07e46837d9da11ce41ea18a5276bfe740aa8dfbc.tar.bz2
slixmpp-07e46837d9da11ce41ea18a5276bfe740aa8dfbc.tar.xz
slixmpp-07e46837d9da11ce41ea18a5276bfe740aa8dfbc.zip
Fix some more blocking iq
Diffstat (limited to 'slixmpp/roster')
-rw-r--r--slixmpp/roster/single.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/slixmpp/roster/single.py b/slixmpp/roster/single.py
index 07a1f188..a37e3eb7 100644
--- a/slixmpp/roster/single.py
+++ b/slixmpp/roster/single.py
@@ -238,7 +238,7 @@ class RosterNode(object):
return self.update(jid, subscription='remove')
def update(self, jid, name=None, subscription=None, groups=[],
- block=True, timeout=None, callback=None):
+ timeout=None, callback=None, timeout_callback=None):
"""
Update a JID's subscription information.
@@ -248,15 +248,11 @@ class RosterNode(object):
subscription -- The subscription state. May be one of: 'to',
'from', 'both', 'none', or 'remove'.
groups -- A list of group names.
- block -- Specify if the roster request will block
- until a response is received, or a timeout
- occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait
for a response before continuing if blocking
is used. Defaults to self.response_timeout.
callback -- Optional reference to a stream handler function.
Will be executed when the roster is received.
- Implies block=False.
"""
self[jid]['name'] = name
self[jid]['groups'] = groups
@@ -269,7 +265,8 @@ class RosterNode(object):
'subscription': subscription,
'groups': groups}}
- return iq.send(block, timeout, callback)
+ return iq.send(timeout=timeout, callback=callback,
+ timeout_callback=timeout_callback)
def presence(self, jid, resource=None):
"""