PY3 get_email support in method ticket_from_message (if message isinstance bytes use email.email_from_bytes(msg) else ..from_string(msg))

This commit is contained in:
Pawel M 2016-12-08 15:14:11 +01:00
parent 431d1fa3a5
commit 4c97ecd0ae

View File

@ -274,7 +274,13 @@ def ticket_from_message(message, queue, logger):
if six.PY2:
message = email.message_from_string(msg)
elif six.PY3:
message = email.message_from_bytes(msg)
print(type(msg))
print(msg)
print(isinstance(msg, bytes))
if isinstance(msg, bytes):
message = email.message_from_bytes(msg)
else:
message = email.message_from_string(msg)
subject = message.get('subject', _('Created from e-mail'))
subject = decode_mail_headers(decodeUnknown(message.get_charset(), subject))
for affix in STRIPPED_SUBJECT_STRINGS: