From ae17b3b8d4b032e7fd09f2f99553296ad8eb3876 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 9 Jan 2014 18:11:58 -0400 Subject: check for none --- mail/changes/bug_4933_check_for_none | 1 + mail/src/leap/mail/walk.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 mail/changes/bug_4933_check_for_none (limited to 'mail') diff --git a/mail/changes/bug_4933_check_for_none b/mail/changes/bug_4933_check_for_none new file mode 100644 index 0000000..33f3bd5 --- /dev/null +++ b/mail/changes/bug_4933_check_for_none @@ -0,0 +1 @@ + o Check for none in payload detection. Closes: #4933 diff --git a/mail/src/leap/mail/walk.py b/mail/src/leap/mail/walk.py index 820b8c7..dc13345 100644 --- a/mail/src/leap/mail/walk.py +++ b/mail/src/leap/mail/walk.py @@ -57,11 +57,13 @@ get_payloads = lambda msg: ((x.get_payload(), get_body_phash_simple = lambda payloads: first( [get_hash(payload) for payload, headers in payloads - if "text/plain" in headers.get('content-type')]) + if payloads + and "text/plain" in headers.get('content-type')]) get_body_phash_multi = lambda payloads: (first( [get_hash(payload) for payload, headers in payloads - if "text/plain" in headers.get('content-type')]) + if payloads + and "text/plain" in headers.get('content-type')]) or get_body_phash_simple(payloads)) """ -- cgit v1.2.3