From 2bfd789215efba198e667f04a0f46cc6c92d40fd Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 5 Jun 2017 10:36:08 -0700 Subject: py3k: Replace 'e.message' with 'str(e)' when handling exceptions --- alot/commands/envelope.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'alot/commands') diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py index 5e62cf43..25fdeb18 100644 --- a/alot/commands/envelope.py +++ b/alot/commands/envelope.py @@ -145,8 +145,8 @@ class SaveCommand(Command): ui.apply_command(globals.FlushCommand()) ui.apply_command(commands.globals.BufferCloseCommand()) except DatabaseError as e: - logging.error(e) - ui.notify('could not index message:\n%s' % e, + logging.error(str(e)) + ui.notify('could not index message:\n%s' % str(e), priority='error', block=True) else: @@ -515,6 +515,7 @@ class SignCommand(Command): except GPGProblem as e: envelope.sign = False ui.notify(str(e), priority='error') +<<<<<<< HEAD return else: try: @@ -523,6 +524,8 @@ class SignCommand(Command): envelope.sign = False ui.notify('Unable to find a matching account', priority='error') +======= +>>>>>>> py3k: Replace 'e.message' with 'str(e)' when handling exceptions return if not acc.gpg_key: envelope.sign = False -- cgit v1.2.3