diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-01-13 11:46:26 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-01-13 11:46:26 -0300 |
| commit | 8ba2ece2d03537af2d9ec719160aeafaea4486b4 (patch) | |
| tree | 50e75397911e65d46bef6026524c7b3f4ca118c1 /mail | |
| parent | 2bbf74071ea8d48d2daafb4c2f9a75b671bca77f (diff) | |
| parent | 902e0fec14bacab2630f5286b811e64cc7aad273 (diff) | |
Merge remote-tracking branch 'refs/remotes/kali/bug/do-not-fail-if-no-content-type' into develop
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/src/leap/mail/walk.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mail/src/leap/mail/walk.py b/mail/src/leap/mail/walk.py index 18717529..dd3b7451 100644 --- a/mail/src/leap/mail/walk.py +++ b/mail/src/leap/mail/walk.py @@ -57,13 +57,12 @@ get_payloads = lambda msg: ((x.get_payload(), get_body_phash_simple = lambda payloads: first( [get_hash(payload) for payload, headers in payloads - if payloads - and "text/plain" in headers.get('content-type')]) + if payloads]) get_body_phash_multi = lambda payloads: (first( [get_hash(payload) for payload, headers in payloads if payloads - and "text/plain" in headers.get('content-type')]) + and "text/plain" in headers.get('content-type', '')]) or get_body_phash_simple(payloads)) """ |