summaryrefslogtreecommitdiff
path: root/alot/commands
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2017-06-05 10:36:08 -0700
committerDylan Baker <dylan@pnwbakers.com>2018-03-01 10:34:56 -0800
commit2bfd789215efba198e667f04a0f46cc6c92d40fd (patch)
tree7b927c94748c23919a9d00c9771133bb9be2828b /alot/commands
parent219e9b038329efdd18dad7ebb17da679825d3e61 (diff)
py3k: Replace 'e.message' with 'str(e)' when handling exceptions
Diffstat (limited to 'alot/commands')
-rw-r--r--alot/commands/envelope.py7
1 files changed, 5 insertions, 2 deletions
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