summaryrefslogtreecommitdiff
path: root/src/leap/mail/smtp
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/smtp
parentf1c1eda351ccb1c8c21c33f0ea83ed93b16dd368 (diff)
[style] pep8 and unused imports cleanup
Diffstat (limited to 'src/leap/mail/smtp')
-rw-r--r--src/leap/mail/smtp/gateway.py5
-rw-r--r--src/leap/mail/smtp/rfc3156.py2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/leap/mail/smtp/gateway.py b/src/leap/mail/smtp/gateway.py
index f6182a2..7dae907 100644
--- a/src/leap/mail/smtp/gateway.py
+++ b/src/leap/mail/smtp/gateway.py
@@ -111,7 +111,10 @@ class SMTPFactory(ServerFactory):
@return: The protocol.
@rtype: SMTPDelivery
"""
- smtpProtocol = SMTPHeloLocalhost(SMTPDelivery(self._userid, self._km, self._encrypted_only, self._outgoing_mail))
+ smtpProtocol = SMTPHeloLocalhost(
+ SMTPDelivery(
+ self._userid, self._km, self._encrypted_only,
+ self._outgoing_mail))
smtpProtocol.factory = self
return smtpProtocol
diff --git a/src/leap/mail/smtp/rfc3156.py b/src/leap/mail/smtp/rfc3156.py
index 62a0675..7d7bc0f 100644
--- a/src/leap/mail/smtp/rfc3156.py
+++ b/src/leap/mail/smtp/rfc3156.py
@@ -19,9 +19,7 @@
Implements RFC 3156: MIME Security with OpenPGP.
"""
-import re
import base64
-from abc import ABCMeta, abstractmethod
from StringIO import StringIO
from twisted.python import log