diff options
| -rw-r--r-- | sleekxmpp/clientxmpp.py | 13 | ||||
| -rw-r--r-- | sleekxmpp/roster/single.py | 18 |
2 files changed, 18 insertions, 13 deletions
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py index a7b24351..02d47648 100644 --- a/sleekxmpp/clientxmpp.py +++ b/sleekxmpp/clientxmpp.py @@ -225,15 +225,8 @@ class ClientXMPP(BaseXMPP): Will be executed when the roster is received. Implies block=False. """ - iq = self.Iq() - iq['type'] = 'set' - iq['roster']['items'] = {jid: {'name': name, - 'subscription': subscription, - 'groups': groups}} - response = iq.send(block, timeout, callback) - if response in [False, None] or not isinstance(response, Iq): - return response - return response['type'] == 'result' + return self.client_roster.updtae(jid, name, subscription, groups, + block, timeout, callback) def del_roster_item(self, jid): """ @@ -243,7 +236,7 @@ class ClientXMPP(BaseXMPP): Arguments: jid -- The JID of the item to remove. """ - return self.update_roster(jid, subscription='remove') + return self.client_roster.remove(jid) def get_roster(self, block=True, timeout=None, callback=None): """ diff --git a/sleekxmpp/roster/single.py b/sleekxmpp/roster/single.py index 6833563f..a8bb8d3a 100644 --- a/sleekxmpp/roster/single.py +++ b/sleekxmpp/roster/single.py @@ -171,9 +171,10 @@ class RosterNode(object): """ self[jid].remove() if not self.xmpp.is_component: - self.update(jid, subscription='remove') + return self.update(jid, subscription='remove') - def update(self, jid, name=None, subscription=None, groups=[]): + def update(self, jid, name=None, subscription=None, groups=[], + block=True, timeout=None, callback=None): """ Update a JID's subscription information. @@ -183,6 +184,15 @@ 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'] = group @@ -194,7 +204,9 @@ class RosterNode(object): iq['roster']['items'] = {jid: {'name': name, 'subscription': subscription, 'groups': groups}} - response = iq.send() + response = iq.send(block, timeout, callback) + if response in [False, None] or isinstance(response, Iq): + return response return response and response['type'] == 'result' def presence(self, jid, resource=None): |