diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2018-04-24 09:22:49 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2018-04-24 09:22:49 -0700 |
commit | d3dbddcc6722f9603c2d4011b1eeab73fa5f1795 (patch) | |
tree | d43e79f7e8dbc200637bf27243a102ef6a83bc13 /alot | |
parent | ecb5d076b52089638c85330655cdb9755fd876e6 (diff) |
db/utils: fix bad merge conflict resolution
oops
Diffstat (limited to 'alot')
-rw-r--r-- | alot/db/utils.py | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/alot/db/utils.py b/alot/db/utils.py index e4eedf1c..43963a56 100644 --- a/alot/db/utils.py +++ b/alot/db/utils.py @@ -358,7 +358,7 @@ def extract_body(mail, types=None, field_key='copiousoutput'): enc = part.get_content_charset() or 'ascii' cte = str(part.get('content-transfer-encoding', '7bit')).lower() payload = part.get_payload() - if cte == '8bit': + if cte == '7bit': if cte == 'quoted-printable': raw_payload = quopri.decodestring(payload.encode('ascii')) elif cte == 'base64': @@ -384,16 +384,6 @@ def extract_body(mail, types=None, field_key='copiousoutput'): payload = raw_payload.decode(enc) except UnicodeDecodeError: pass - elif cte != '7bit': - if cte == 'quoted-printable': - raw_payload = quopri.decodestring(payload.encode('ascii')) - elif cte == 'base64': - raw_payload = base64.b64decode(payload) - else: - raise Exception('Unknown Content-Transfer-Encoding {}'.format(cte)) - # message.get_payload(decode=True) also handles a number of unicode - # encodindigs. maybe those are useful? - payload = raw_payload.decode(enc) if ctype == 'text/plain': body_parts.append(string_sanitize(payload)) |