diff options
| author | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-09-16 10:13:12 +0200 |
|---|---|---|
| committer | Bruno Wagner <bwagner@riseup.net> | 2015-09-22 17:03:31 -0300 |
| commit | 300e3a1d6f8604daf4eb287b83e294c05dfabbc8 (patch) | |
| tree | ff64a102deab6aa1e18c097de906f555b2cd1616 | |
| parent | cc437cd97cb8ee43e6042cd510963f57a7db53c2 (diff) | |
[style] fix pep8 warnings
| -rw-r--r-- | mail/src/leap/mail/outgoing/service.py | 4 | ||||
| -rw-r--r-- | mail/src/leap/mail/smtp/gateway.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mail/src/leap/mail/outgoing/service.py b/mail/src/leap/mail/outgoing/service.py index 3708f332..37546500 100644 --- a/mail/src/leap/mail/outgoing/service.py +++ b/mail/src/leap/mail/outgoing/service.py @@ -241,7 +241,7 @@ class OutgoingMail: def signal_encrypt_sign(newmsg): emit_async(catalog.SMTP_END_ENCRYPT_AND_SIGN, - "%s,%s" % (self._from_address, to_address)) + "%s,%s" % (self._from_address, to_address)) return newmsg, recipient def if_key_not_found_send_unencrypted(failure, message): @@ -260,7 +260,7 @@ class OutgoingMail: log.msg("Will encrypt the message with %s and sign with %s." % (to_address, from_address)) emit_async(catalog.SMTP_START_ENCRYPT_AND_SIGN, - "%s,%s" % (self._from_address, to_address)) + "%s,%s" % (self._from_address, to_address)) d = self._maybe_attach_key(origmsg, from_address, to_address) d.addCallback(maybe_encrypt_and_sign) return d diff --git a/mail/src/leap/mail/smtp/gateway.py b/mail/src/leap/mail/smtp/gateway.py index dd110e0d..c9883675 100644 --- a/mail/src/leap/mail/smtp/gateway.py +++ b/mail/src/leap/mail/smtp/gateway.py @@ -204,7 +204,8 @@ class SMTPDelivery(object): # verify if recipient key is available in keyring def found(_): log.msg("Accepting mail for %s..." % user.dest.addrstr) - emit_async(catalog.SMTP_RECIPIENT_ACCEPTED_ENCRYPTED, user.dest.addrstr) + emit_async(catalog.SMTP_RECIPIENT_ACCEPTED_ENCRYPTED, + user.dest.addrstr) def not_found(failure): failure.trap(KeyNotFound) |