diff options
| author | Kali Kaneko <kali@leap.se> | 2013-07-23 19:03:55 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-07-23 19:03:55 +0200 |
| commit | 74391223596f4ead1d002f17320aae3237119c88 (patch) | |
| tree | 89422274abe88c2638670eda4881c8582541308d /src/leap/mail/smtp/smtprelay.py | |
| parent | 9a5a325831230687a7da4ad5300c99f03aebba72 (diff) | |
| parent | dae82d597288e4795c3522c4dafde6622a53d477 (diff) | |
Merge remote-tracking branch 'drebs/feature/3037-separate-keymanager-into-its-own-package' into develop
Diffstat (limited to 'src/leap/mail/smtp/smtprelay.py')
| -rw-r--r-- | src/leap/mail/smtp/smtprelay.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/leap/mail/smtp/smtprelay.py b/src/leap/mail/smtp/smtprelay.py index d87dc87..1738840 100644 --- a/src/leap/mail/smtp/smtprelay.py +++ b/src/leap/mail/smtp/smtprelay.py @@ -21,7 +21,6 @@ LEAP SMTP encrypted relay. import re import os -import gnupg import tempfile @@ -38,13 +37,13 @@ from email.parser import Parser from leap.common.check import leap_assert, leap_assert_type -from leap.common.keymanager import KeyManager -from leap.common.keymanager.openpgp import ( +from leap.keymanager import KeyManager +from leap.keymanager.openpgp import ( OpenPGPKey, encrypt_asym, sign, ) -from leap.common.keymanager.errors import KeyNotFound +from leap.keymanager.errors import KeyNotFound # |