diff options
author | Kali Kaneko <kali@leap.se> | 2016-04-27 20:34:08 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2016-04-27 20:34:08 -0400 |
commit | 593b004ae97b501b8512bb822a22f417b9285d88 (patch) | |
tree | ebf6d229394e4adfe5d444540114910257d4650c /src/leap/bitmask/backend | |
parent | d2806583ead2712c9095b82f31b50924dfc80411 (diff) | |
parent | 64e4a8e4d5ed26014e8542d73a6bc989b8666598 (diff) |
Merge branch 'develop' into debian/experimental
Diffstat (limited to 'src/leap/bitmask/backend')
-rw-r--r-- | src/leap/bitmask/backend/components.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py index 3192e1c4..ba64fd65 100644 --- a/src/leap/bitmask/backend/components.py +++ b/src/leap/bitmask/backend/components.py @@ -994,14 +994,14 @@ class Keymanager(object): d.addCallback(export) d.addErrback(log_error) + @defer.inlineCallbacks def list_keys(self): """ List all the keys stored in the local DB. """ - d = self._keymanager_proxy.get_all_keys() - d.addCallback( - lambda keys: - self._signaler.signal(self._signaler.keymanager_keys_list, keys)) + keys = yield self._keymanager_proxy.get_all_keys() + keydicts = [dict(key) for key in keys] + self._signaler.signal(self._signaler.keymanager_keys_list, keydicts) def get_key_details(self, username): """ @@ -1009,7 +1009,7 @@ class Keymanager(object): """ def signal_details(public_key): self._signaler.signal(self._signaler.keymanager_key_details, - public_key.get_dict()) + dict(public_key)) d = self._keymanager_proxy.get_key(username, openpgp.OpenPGPKey) |