zev/imbox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

excluded attachments from charset decoding; fixed regex in decode_param

Browse Source
This commit is contained in:
ookami.kb
2015-02-04 00:57:22 +01:00
parent 9e3fe0c1c8
commit 03ffe55255
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
imbox/parser.py
View File

@@ -61,7 +61,7 @@ def decode_param(param):
values = v.split('\n')
value_results = []
for value in values:
match = re.search(r'=\?(\w+)\?(Q|B)\?(.+)\?=', value)
match = re.search(r'=\?((?:\w|-)+)\?(Q|B)\?(.+)\?=', value)
if match:
encoding, type_, code = match.groups()
if type_ == 'Q':
@@ -127,9 +127,12 @@ def parse_email(raw_email):
if maintype == 'multipart':
for part in email_message.walk():
content = decode_content(part)
content_type = part.get_content_type()
content_disposition = part.get('Content-Disposition', None)
if content_disposition:
content = part.get_payload(decode=True)
else:
content = decode_content(part)
is_inline = content_disposition is None \
or content_disposition == "inline"