decode windows
This commit is contained in:
parent
7bb86c323e
commit
5905769665
1 changed files with 10 additions and 7 deletions
|
@ -306,13 +306,16 @@ class ImapFilter:
|
|||
else:
|
||||
try:
|
||||
field_data = raw_field_data[0].decode()
|
||||
except UnicodeDecodeError as error:
|
||||
self._log.error(
|
||||
"Error decoding field data as UTF-8. Data: %s. Error: %s",
|
||||
raw_field_data[0],
|
||||
error
|
||||
)
|
||||
break
|
||||
except UnicodeDecodeError:
|
||||
try:
|
||||
field_data = raw_field_data[0].decode('Windows-1252')
|
||||
except UnicodeDecodeError as error:
|
||||
self._log.error(
|
||||
"Error decoding field data as UTF-8. Data: %s. Error: %s",
|
||||
raw_field_data[0],
|
||||
error
|
||||
)
|
||||
break
|
||||
if 'regexp' in mfilter:
|
||||
if not isinstance(mfilter['regexp'], list):
|
||||
mfilter['regexp'] = [ mfilter['regexp'] ]
|
||||
|
|
Loading…
Reference in a new issue