From bb879a2d278ed7475deade580793d9defc35ad57 Mon Sep 17 00:00:00 2001 From: Martin Schaaf Date: Tue, 12 Dec 2017 20:14:19 +0100 Subject: * apply code review comments --- alot/commands/utils.py | 2 +- alot/ui.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'alot') diff --git a/alot/commands/utils.py b/alot/commands/utils.py index cb696eea..b7915378 100644 --- a/alot/commands/utils.py +++ b/alot/commands/utils.py @@ -90,7 +90,7 @@ def _get_keys(ui, encrypt_keyids, block_error=False, signed_only=False): signed_only=signed_only) except GPGProblem as e: if e.code == GPGCode.AMBIGUOUS_NAME: - tmp_choices = [k.uids[0].uid + " (" + k.fpr + ")" for k in + tmp_choices = ['{} ({})'.format(k.uids[0].uid, k.fpr) for k in crypto.list_keys(hint=keyid)] choices = {str(i): t for i, t in enumerate(tmp_choices, 1)} keys_to_return = {str(i): t for i, t in enumerate([k for k in diff --git a/alot/ui.py b/alot/ui.py index 9dd84425..ef593a23 100644 --- a/alot/ui.py +++ b/alot/ui.py @@ -481,8 +481,8 @@ class UI(object): self._notificationbar = None self.update() - def choice(self, message, choices=None, choices_to_return=None, - select=None, cancel=None, msg_position='above'): + def choice(self, message, choices=None, select=None, cancel=None, + msg_position='above', choices_to_return=None): """ prompt user to make a choice. -- cgit v1.2.3