diff options
author | drebs <drebs@leap.se> | 2013-01-28 17:49:02 -0200 |
---|---|---|
committer | drebs <drebs@leap.se> | 2013-01-28 17:49:02 -0200 |
commit | badc4aedb69ec94abd7d66347d94ac817c73fff6 (patch) | |
tree | 11bb217c7eaf59d20a286b391349ce2b4d89c23d /src/leap/email/smtp/tests/test_smtprelay.py | |
parent | 74797eea423aeeb3338b51d78c681bbbf27c8eba (diff) | |
parent | d461e547f4d239c2b377fdd723937614a98c7723 (diff) |
Merge branch 'feature/smtp-relay' into develop
Diffstat (limited to 'src/leap/email/smtp/tests/test_smtprelay.py')
-rw-r--r-- | src/leap/email/smtp/tests/test_smtprelay.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/leap/email/smtp/tests/test_smtprelay.py b/src/leap/email/smtp/tests/test_smtprelay.py index dc0055c6..54aa6dea 100644 --- a/src/leap/email/smtp/tests/test_smtprelay.py +++ b/src/leap/email/smtp/tests/test_smtprelay.py @@ -6,9 +6,7 @@ from leap.email.smtp.smtprelay import ( EncryptedMessage, ) from leap.email.smtp import tests -from twisted.internet.error import ConnectionDone from twisted.test import proto_helpers -from twisted.internet import defer from twisted.mail.smtp import User |