diff options
Diffstat (limited to 'src/leap')
| -rw-r--r-- | src/leap/bitmask/cli/command.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/core/mail_services.py | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/leap/bitmask/cli/command.py b/src/leap/bitmask/cli/command.py index 1694956e..16f483a3 100644 --- a/src/leap/bitmask/cli/command.py +++ b/src/leap/bitmask/cli/command.py @@ -39,6 +39,8 @@ def _print_result(result): def default_dict_printer(result): + if not result: + return for key, value in result.items(): if value is None: value = str(value) diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py index 183477af..b6c54047 100644 --- a/src/leap/bitmask/core/mail_services.py +++ b/src/leap/bitmask/core/mail_services.py @@ -18,7 +18,7 @@ Mail services. This is quite moving work still. -This should be moved to the different packages when it stabilizes. +This should be moved to the different submodules when it stabilizes. """ import json import os @@ -398,19 +398,19 @@ class KeymanagerService(HookableService): # commands def do_list_keys(self, userid, private=False): - km = self._container.get_instance(userid) + km = self._container.get_instance(userid['user']) d = km.get_all_keys(private=private) d.addCallback(lambda keys: [dict(key) for key in keys]) return d def do_export(self, userid, address, private=False): - km = self._container.get_instance(userid) + km = self._container.get_instance(userid['user']) d = km.get_key(address, private=private, fetch_remote=False) d.addCallback(lambda key: dict(key)) return d def do_insert(self, userid, address, rawkey, validation='Fingerprint'): - km = self._container.get_instance(userid) + km = self._container.get_instance(userid['user']) validation = ValidationLevels.get(validation) d = km.put_raw_key(rawkey, address, validation=validation) d.addCallback(lambda _: km.get_key(address, fetch_remote=False)) @@ -419,7 +419,7 @@ class KeymanagerService(HookableService): @defer.inlineCallbacks def do_delete(self, userid, address, private=False): - km = self._container.get_instance(userid) + km = self._container.get_instance(userid['user']) key = yield km.get_key(address, private=private, fetch_remote=False) km.delete_key(key) defer.returnValue(key.fingerprint) |