summaryrefslogtreecommitdiff
path: root/src/leap/services/mail
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-05-29 04:02:43 +0900
committerkali <kali@leap.se>2013-05-30 02:57:20 +0900
commit884d0e0f4dbba34b6f6f5afe6e27390a7606a7fa (patch)
tree7abe4115eab8959b191a64706743df70dff92a79 /src/leap/services/mail
parentc4ba840c7c0df81fa928bab2edd1f2a2e3379952 (diff)
make tests pass & fix pep8
Diffstat (limited to 'src/leap/services/mail')
-rw-r--r--src/leap/services/mail/smtpbootstrapper.py8
-rw-r--r--src/leap/services/mail/smtpconfig.py1
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")
-