diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-05-29 15:20:32 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-05-29 15:20:32 -0300 |
| commit | 1f3573503be0cf7d61fa80ea866b8bef4a57b111 (patch) | |
| tree | ab93803d57673f3dce633472baf20dc353c00a44 /src/leap/services/mail | |
| parent | 7780685a8beb8fbba54d5c366905d9ece5569008 (diff) | |
| parent | 884d0e0f4dbba34b6f6f5afe6e27390a7606a7fa (diff) | |
Merge remote-tracking branch 'kali/feature/ci-ready' into develop
Diffstat (limited to 'src/leap/services/mail')
| -rw-r--r-- | src/leap/services/mail/smtpbootstrapper.py | 8 | ||||
| -rw-r--r-- | src/leap/services/mail/smtpconfig.py | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/leap/services/mail/smtpbootstrapper.py b/src/leap/services/mail/smtpbootstrapper.py index 7e0f10de..6e0a0a47 100644 --- a/src/leap/services/mail/smtpbootstrapper.py +++ b/src/leap/services/mail/smtpbootstrapper.py @@ -116,10 +116,10 @@ class SMTPBootstrapper(QtCore.QObject): # Not modified if res.status_code == 304: logger.debug("SMTP definition has not been modified") - self._smtp_config.load(os.path.join("leap", - "providers", - self._provider_config.get_domain(), - "smtp-service.json")) + self._smtp_config.load(os.path.join( + "leap", "providers", + self._provider_config.get_domain(), + "smtp-service.json")) else: smtp_definition, mtime = get_content(res) diff --git a/src/leap/services/mail/smtpconfig.py b/src/leap/services/mail/smtpconfig.py index e7e2895a..30371005 100644 --- a/src/leap/services/mail/smtpconfig.py +++ b/src/leap/services/mail/smtpconfig.py @@ -45,4 +45,3 @@ class SMTPConfig(BaseConfig): def get_locations(self): return self._safe_get_value("locations") - |