diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2016-05-03 11:49:38 -0300 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2016-05-18 22:58:19 +0200 |
| commit | a681acde5bdd757ea7be33426660c0cb41cf01d8 (patch) | |
| tree | 3fd034c7997d52a595b5e7bbafa2c58094549513 /src/leap/mail/smtp | |
| parent | 8c312540e7974cd93e4c030167f9e937ed6aa16b (diff) | |
[feat] Adapt to the new KeyManager API without key types.
- Related: #8031
Diffstat (limited to 'src/leap/mail/smtp')
| -rw-r--r-- | src/leap/mail/smtp/gateway.py | 3 | ||||
| -rw-r--r-- | src/leap/mail/smtp/tests/test_gateway.py | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/leap/mail/smtp/gateway.py b/src/leap/mail/smtp/gateway.py index bd0be6f..7467608 100644 --- a/src/leap/mail/smtp/gateway.py +++ b/src/leap/mail/smtp/gateway.py @@ -48,7 +48,6 @@ from leap.mail.utils import validate_address from leap.mail.rfc3156 import RFC3156CompliantGenerator from leap.mail.outgoing.service import outgoingFactory from leap.mail.smtp.bounces import bouncerFactory -from leap.keymanager.openpgp import OpenPGPKey from leap.keymanager.errors import KeyNotFound # replace email generator with a RFC 3156 compliant one. @@ -321,7 +320,7 @@ class SMTPDelivery(object): def encrypt_func(_): return lambda: EncryptedMessage(user, self._outgoing_mail) - d = self._km.get_key(address, OpenPGPKey) + d = self._km.get_key(address) d.addCallbacks(found, not_found) d.addCallback(encrypt_func) return d diff --git a/src/leap/mail/smtp/tests/test_gateway.py b/src/leap/mail/smtp/tests/test_gateway.py index df83cf0..de31e11 100644 --- a/src/leap/mail/smtp/tests/test_gateway.py +++ b/src/leap/mail/smtp/tests/test_gateway.py @@ -147,7 +147,7 @@ class TestSmtpGateway(TestCaseWithKeyManager): True. """ # remove key from key manager - pubkey = yield self._km.get_key(ADDRESS, openpgp.OpenPGPKey) + pubkey = yield self._km.get_key(ADDRESS) pgp = openpgp.OpenPGPScheme( self._soledad, gpgbinary=self.GPG_BINARY_PATH) yield pgp.delete_key(pubkey) @@ -178,7 +178,7 @@ class TestSmtpGateway(TestCaseWithKeyManager): False. """ # remove key from key manager - pubkey = yield self._km.get_key(ADDRESS, openpgp.OpenPGPKey) + pubkey = yield self._km.get_key(ADDRESS) pgp = openpgp.OpenPGPScheme( self._soledad, gpgbinary=self.GPG_BINARY_PATH) yield pgp.delete_key(pubkey) |