diff options
| author | Kali Kaneko <kali@leap.se> | 2015-09-22 17:38:48 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-09-23 12:00:15 -0400 |
| commit | fcdc227c23e6958aab902c95aeab35285c9993f0 (patch) | |
| tree | 30b8e0f597267e828a98db971dff570ad54daf2e /src/leap/mail/outgoing | |
| parent | 309578890ba5d188f3d569473d756c28e06aa7ab (diff) | |
[refactor] avoid circular import due to rfc3156
Diffstat (limited to 'src/leap/mail/outgoing')
| -rw-r--r-- | src/leap/mail/outgoing/service.py | 12 | ||||
| -rw-r--r-- | src/leap/mail/outgoing/tests/test_outgoing.py | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/leap/mail/outgoing/service.py b/src/leap/mail/outgoing/service.py index 3754650..7cc5a24 100644 --- a/src/leap/mail/outgoing/service.py +++ b/src/leap/mail/outgoing/service.py @@ -36,12 +36,12 @@ from leap.keymanager.openpgp import OpenPGPKey from leap.keymanager.errors import KeyNotFound, KeyAddressMismatch from leap.mail import __version__ from leap.mail.utils import validate_address -from leap.mail.smtp.rfc3156 import MultipartEncrypted -from leap.mail.smtp.rfc3156 import MultipartSigned -from leap.mail.smtp.rfc3156 import encode_base64_rec -from leap.mail.smtp.rfc3156 import RFC3156CompliantGenerator -from leap.mail.smtp.rfc3156 import PGPSignature -from leap.mail.smtp.rfc3156 import PGPEncrypted +from leap.mail.rfc3156 import MultipartEncrypted +from leap.mail.rfc3156 import MultipartSigned +from leap.mail.rfc3156 import encode_base64_rec +from leap.mail.rfc3156 import RFC3156CompliantGenerator +from leap.mail.rfc3156 import PGPSignature +from leap.mail.rfc3156 import PGPEncrypted # TODO # [ ] rename this module to something else, service should be the implementor diff --git a/src/leap/mail/outgoing/tests/test_outgoing.py b/src/leap/mail/outgoing/tests/test_outgoing.py index 2376da9..5518b33 100644 --- a/src/leap/mail/outgoing/tests/test_outgoing.py +++ b/src/leap/mail/outgoing/tests/test_outgoing.py @@ -30,7 +30,7 @@ from twisted.mail.smtp import User from mock import Mock from leap.mail.smtp.gateway import SMTPFactory -from leap.mail.smtp.rfc3156 import RFC3156CompliantGenerator +from leap.mail.rfc3156 import RFC3156CompliantGenerator from leap.mail.outgoing.service import OutgoingMail from leap.mail.tests import ( TestCaseWithKeyManager, |