diff options
| author | antialias <antialias@leap.se> | 2013-01-30 13:26:18 -0500 |
|---|---|---|
| committer | antialias <antialias@leap.se> | 2013-01-30 13:26:18 -0500 |
| commit | 4b0dc38d6eaa970b49cadbf5c0174eb7c34197fc (patch) | |
| tree | 69e225fcbc2be0ad7055454fe6f91e82d21655bc /src/leap/email/smtp | |
| parent | b3f30d14d8a8e728d904b78e9235d63d25e475d1 (diff) | |
pep8.
Diffstat (limited to 'src/leap/email/smtp')
| -rw-r--r-- | src/leap/email/smtp/smtprelay.py | 4 | ||||
| -rw-r--r-- | src/leap/email/smtp/tests/test_smtprelay.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/email/smtp/smtprelay.py b/src/leap/email/smtp/smtprelay.py index 7a647717..fdb8eb91 100644 --- a/src/leap/email/smtp/smtprelay.py +++ b/src/leap/email/smtp/smtprelay.py @@ -106,7 +106,7 @@ class EncryptedMessage(): """Separate message headers from body.""" sep = self.lines.index('') self.headers = self.lines[:sep] - self.body = self.lines[sep+1:] + self.body = self.lines[sep + 1:] def connectionLost(self): log.msg("Connection lost unexpectedly!") @@ -128,7 +128,7 @@ class EncryptedMessage(): def sendMessage(self): self.prepareHeader() - msg = '\n'.join(self.headers+[self.cyphertext]) + msg = '\n'.join(self.headers + [self.cyphertext]) d = defer.Deferred() factory = smtp.ESMTPSenderFactory(self.smtp_username, self.smtp_password, diff --git a/src/leap/email/smtp/tests/test_smtprelay.py b/src/leap/email/smtp/tests/test_smtprelay.py index 109e253b..1c549eb3 100644 --- a/src/leap/email/smtp/tests/test_smtprelay.py +++ b/src/leap/email/smtp/tests/test_smtprelay.py @@ -60,7 +60,7 @@ class TestSmtpRelay(tests.OpenPGPTestCase): for i, line in enumerate(self.EMAIL_DATA): proto.lineReceived(line + '\r\n') self.assertMatch(transport.value(), - '\r\n'.join(SMTP_ANSWERS[0:i+1])) + '\r\n'.join(SMTP_ANSWERS[0:i + 1])) proto.setTimeout(None) def test_message_encrypt(self): |