holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-11-29 03:13:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Pawel M 2016-12-08 15:14:11 +01:00
parent 431d1fa3a5
commit 4c97ecd0ae
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helpdesk/management/commands/get_email.py
View File

@ -274,7 +274,13 @@ def ticket_from_message(message, queue, logger):
if six.PY2: if six.PY2:
message = email.message_from_string(msg) message = email.message_from_string(msg)
elif six.PY3: 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 = message.get('subject', _('Created from e-mail'))
subject = decode_mail_headers(decodeUnknown(message.get_charset(), subject)) subject = decode_mail_headers(decodeUnknown(message.get_charset(), subject))
for affix in STRIPPED_SUBJECT_STRINGS: for affix in STRIPPED_SUBJECT_STRINGS: