diff options
author | Kali Kaneko <kali@leap.se> | 2015-08-03 14:27:48 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2015-08-03 14:27:48 -0400 |
commit | a778140a3dfa2907d2e1d45cfa87ee3b2dd5329a (patch) | |
tree | db4b3587b6295730e059279925cbb97fbdb7cb7b /src/leap/mail/incoming/service.py | |
parent | f27ad9a3fdb2a6746ddb13fe4c117614c4b59364 (diff) | |
parent | 5027dd2dd3c7679a7eea025d838a7d472c355623 (diff) |
Merge remote-tracking branch 'leapcode/pr/188' into develop
Diffstat (limited to 'src/leap/mail/incoming/service.py')
-rw-r--r-- | src/leap/mail/incoming/service.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/leap/mail/incoming/service.py b/src/leap/mail/incoming/service.py index 3daf86b..2bc6751 100644 --- a/src/leap/mail/incoming/service.py +++ b/src/leap/mail/incoming/service.py @@ -429,9 +429,9 @@ class IncomingMail(Service): fromHeader = msg.get('from', None) senderAddress = None - if (fromHeader is not None - and (msg.get_content_type() == MULTIPART_ENCRYPTED - or msg.get_content_type() == MULTIPART_SIGNED)): + if (fromHeader is not None and + (msg.get_content_type() == MULTIPART_ENCRYPTED or + msg.get_content_type() == MULTIPART_SIGNED)): senderAddress = parseaddr(fromHeader)[1] def add_leap_header(ret): @@ -635,8 +635,10 @@ class IncomingMail(Service): url = shlex.split(fields['url'])[0] # remove quotations urlparts = urlparse(url) addressHostname = address.split('@')[1] - if (urlparts.scheme == 'https' - and urlparts.hostname == addressHostname): + if ( + urlparts.scheme == 'https' and + urlparts.hostname == addressHostname + ): def fetch_error(failure): if failure.check(keymanager_errors.KeyNotFound): logger.warning("Url from OpenPGP header %s failed" |