core: fixes bug introduced by 1262 (f8a8434dbac7) in SAT.delContact

This commit is contained in:
souliane 2015-03-06 16:06:38 +01:00
commit b524d41446

View file

@ -638,15 +638,8 @@ class SAT(service.Service):
"""Remove contact from roster list"""
profile = self.memory.getProfileName(profile_key)
assert profile
d1 = self.profiles[profile].roster.removeItem(to_jid)
d2 = self.profiles[profile].presence.unsubscribe(to_jid)
d_list = defer.DeferredList([d1, d2])
def check_result(list_result):
for success, value in list_result:
if not success:
raise value
d_list.addCallback(check_result)
return d_list
self.profiles[profile].presence.unsubscribe(to_jid) # is not asynchronous
return self.profiles[profile].roster.removeItem(to_jid)
## Discovery ##
# discovery methods are shortcuts to self.memory.disco