diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2016-05-03 11:56:08 -0300 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2016-05-24 20:09:57 +0200 |
| commit | c416fd56ebba9924c1bb0caa60da667204c701e3 (patch) | |
| tree | 9f25ce9cf0cb944a1d10fe9a838d01652a396979 /src/leap/bitmask/backend/components.py | |
| parent | 7ba3e07b4659de38a189798540fe5e80b66b10d0 (diff) | |
[feat] Adapt to the new KeyManager API without key types
- Related: #8031
Diffstat (limited to 'src/leap/bitmask/backend/components.py')
| -rw-r--r-- | src/leap/bitmask/backend/components.py | 8 |
1 files changed, 3 insertions, 5 deletions
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) |