From 82652e174b4f38a29ce488421eb6c0067d0c657f Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Sat, 14 Feb 2015 17:52:27 -0600 Subject: Do the soledad sync the twisted way This closes: #6658 and #6691 --- src/leap/bitmask/backend/components.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/leap/bitmask/backend/components.py') diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py index a843147e..1efcda6c 100644 --- a/src/leap/bitmask/backend/components.py +++ b/src/leap/bitmask/backend/components.py @@ -779,10 +779,8 @@ class Soledad(object): """ provider_config = ProviderConfig.get_provider_config(domain) if provider_config is not None: - # XXX FIXME --- remove defer-to-thread or at least put it in a - # separate threadpool. - self._soledad_defer = threads.deferToThread( - self._soledad_bootstrapper.run_soledad_setup_checks, + sb = self._soledad_bootstrapper + self._soledad_defer = sb.run_soledad_setup_checks( provider_config, username, password, download_if_needed=True) self._soledad_defer.addCallback(self._set_proxies_cb) -- cgit v1.2.3