From b524d4144665737e8cfb65264771567ebf1cdaae Mon Sep 17 00:00:00 2001 From: souliane Date: Fri, 6 Mar 2015 16:06:38 +0100 Subject: [PATCH] core: fixes bug introduced by 1262 (f8a8434dbac7) in SAT.delContact --- src/core/sat_main.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/core/sat_main.py b/src/core/sat_main.py index d8ac3e87..856bee34 100644 --- a/src/core/sat_main.py +++ b/src/core/sat_main.py @@ -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