From c416fd56ebba9924c1bb0caa60da667204c701e3 Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Tue, 3 May 2016 11:56:08 -0300 Subject: [feat] Adapt to the new KeyManager API without key types - Related: #8031 --- src/leap/bitmask/backend/components.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/leap/bitmask/backend/components.py') diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py index ba64fd65..714de4ca 100644 --- a/src/leap/bitmask/backend/components.py +++ b/src/leap/bitmask/backend/components.py @@ -987,9 +987,8 @@ class Keymanager(object): "Error exporting key. {0!r}".format(failure.value)) self._signaler.signal(self._signaler.keymanager_export_error) - dpub = keymanager.get_key(username, openpgp.OpenPGPKey) - dpriv = keymanager.get_key(username, openpgp.OpenPGPKey, - private=True) + dpub = keymanager.get_key(username) + dpriv = keymanager.get_key(username, private=True) d = defer.gatherResults([dpub, dpriv]) d.addCallback(export) d.addErrback(log_error) @@ -1011,8 +1010,7 @@ class Keymanager(object): self._signaler.signal(self._signaler.keymanager_key_details, dict(public_key)) - d = self._keymanager_proxy.get_key(username, - openpgp.OpenPGPKey) + d = self._keymanager_proxy.get_key(username) d.addCallback(signal_details) -- cgit v1.2.3