diff options
| -rw-r--r-- | alot/commands/thread.py | 4 | ||||
| -rw-r--r-- | alot/db/utils.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/alot/commands/thread.py b/alot/commands/thread.py index 55920090..ad7110ed 100644 --- a/alot/commands/thread.py +++ b/alot/commands/thread.py @@ -965,8 +965,8 @@ class OpenAttachmentCommand(Command): handler_cmdlist = split_commandstring(handler_cmd) # 'needsterminal' makes handler overtake the terminal - nt = entry.get('needsterminal', None) - overtakes = (nt is None) + # XXX: could this be repalced with "'needsterminal' not in entry"? + overtakes = entry.get('needsterminal') is None ui.apply_command(ExternalCommand(handler_cmdlist, stdin=handler_stdin, diff --git a/alot/db/utils.py b/alot/db/utils.py index 5acbb017..188a4b3a 100644 --- a/alot/db/utils.py +++ b/alot/db/utils.py @@ -111,7 +111,7 @@ def message_from_file(handle): # handle OpenPGP signed data if (m.is_multipart() and m.get_content_subtype() == 'signed' and - p.get('protocol', None) == app_pgp_sig): + p.get('protocol') == app_pgp_sig): # RFC 3156 is quite strict: # * exactly two messages # * the second is of type 'application/pgp-signature' @@ -147,7 +147,7 @@ def message_from_file(handle): # handle OpenPGP encrypted data elif (m.is_multipart() and m.get_content_subtype() == 'encrypted' and - p.get('protocol', None) == app_pgp_enc and + p.get('protocol') == app_pgp_enc and 'Version: 1' in m.get_payload(0).get_payload()): # RFC 3156 is quite strict: # * exactly two messages |