summaryrefslogtreecommitdiff
path: root/src/leap/mail/outgoing
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2015-06-18 12:34:43 -0300
committerdrebs <drebs@leap.se>2015-06-18 13:55:52 -0300
commit1348798e88c6026f57ff938c59a2dce979a9a891 (patch)
tree38a32fdd333caddfe0d9320e5b8b470819002ca0 /src/leap/mail/outgoing
parentf1c1eda351ccb1c8c21c33f0ea83ed93b16dd368 (diff)
[style] pep8 and unused imports cleanup
Diffstat (limited to 'src/leap/mail/outgoing')
-rw-r--r--src/leap/mail/outgoing/service.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/leap/mail/outgoing/service.py b/src/leap/mail/outgoing/service.py
index 60ba8f5..838a908 100644
--- a/src/leap/mail/outgoing/service.py
+++ b/src/leap/mail/outgoing/service.py
@@ -32,7 +32,6 @@ from twisted.python import log
from leap.common.check import leap_assert_type, leap_assert
from leap.common.events import emit, catalog
-from leap.keymanager import KeyManager
from leap.keymanager.openpgp import OpenPGPKey
from leap.keymanager.errors import KeyNotFound, KeyAddressMismatch
from leap.mail import __version__
@@ -169,8 +168,8 @@ class OutgoingMail:
# we don't pass an ssl context factory to the ESMTPSenderFactory
# because ssl will be handled by reactor.connectSSL() below.
factory = smtp.ESMTPSenderFactory(
- "", # username is blank because client auth is done on SSL protocol level
- "", # password is blank because client auth is done on SSL protocol level
+ "", # username is blank, no client auth here
+ "", # password is blank, no client auth here
self._from_address,
recipient.dest.addrstr,
StringIO(msg),
@@ -242,7 +241,7 @@ class OutgoingMail:
def signal_encrypt_sign(newmsg):
emit(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):
@@ -261,7 +260,7 @@ class OutgoingMail:
log.msg("Will encrypt the message with %s and sign with %s."
% (to_address, from_address))
emit(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