summaryrefslogtreecommitdiff
path: root/src/leap/services
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-06-05 05:52:04 +0900
committerkali <kali@leap.se>2013-06-05 05:52:04 +0900
commitba95cf448fa5ef3261e011921450ab4a6b13c8d6 (patch)
treec9aee26a96d49a3e6dc8217f7a2ae8f3faab9e91 /src/leap/services
parent1856970049752fbe1b3c68ed46d5de7fde5bb2ad (diff)
parent655cec1fec89eb30fc17bdc0a5f527e5a91ba5b0 (diff)
Merge remote-tracking branch 'chiiph/bug/checker_thread' into develop
Diffstat (limited to 'src/leap/services')
-rw-r--r--src/leap/services/abstractbootstrapper.py1
-rw-r--r--src/leap/services/eip/eipbootstrapper.py3
-rw-r--r--src/leap/services/mail/smtpbootstrapper.py3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/leap/services/abstractbootstrapper.py b/src/leap/services/abstractbootstrapper.py
index bce03e6b..7bebdc15 100644
--- a/src/leap/services/abstractbootstrapper.py
+++ b/src/leap/services/abstractbootstrapper.py
@@ -152,4 +152,3 @@ class AbstractBootstrapper(QtCore.QObject):
d.addErrback(self._errback, signal=sig)
d.addCallback(self._gui_notify, signal=sig)
d.addErrback(self._gui_errback)
-
diff --git a/src/leap/services/eip/eipbootstrapper.py b/src/leap/services/eip/eipbootstrapper.py
index 7216bb80..51c3dab4 100644
--- a/src/leap/services/eip/eipbootstrapper.py
+++ b/src/leap/services/eip/eipbootstrapper.py
@@ -173,7 +173,8 @@ class EIPBootstrapper(AbstractBootstrapper):
cb_chain = [
(self._download_config, self.download_config),
- (self._download_client_certificates, self.download_client_certificate)
+ (self._download_client_certificates, \
+ self.download_client_certificate)
]
self.addCallbackChain(cb_chain)
diff --git a/src/leap/services/mail/smtpbootstrapper.py b/src/leap/services/mail/smtpbootstrapper.py
index 64bf3153..ea480c6d 100644
--- a/src/leap/services/mail/smtpbootstrapper.py
+++ b/src/leap/services/mail/smtpbootstrapper.py
@@ -96,7 +96,8 @@ class SMTPBootstrapper(AbstractBootstrapper):
logger.debug("SMTP definition has not been modified")
self._smtp_config.load(os.path.join("leap",
"providers",
- self._provider_config.get_domain(),
+ self._provider_config.\
+ get_domain(),
"smtp-service.json"))
else:
smtp_definition, mtime = get_content(res)