holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2025-08-09 06:55:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

merged with upstream

Browse Source
This commit is contained in:
Pawel M
2016-12-12 10:31:29 +01:00
parent c11e360f50
commit 04ec40bbc8
2 changed files with 455 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,14 +264,13 @@ def decode_mail_headers(string):
def ticket_from_message(message, queue, logger):
# 'message' must be an RFC822 formatted message.
msg = message
if six.PY2:
message = email.message_from_string(msg)
elif six.PY3:
if isinstance(msg, bytes):
message = email.message_from_bytes(msg)
else:
message = email.message_from_string(msg)
# if six.PY2:
message = email.message_from_string(message)
# elif six.PY3:
# if isinstance(msg, bytes):
# message = email.message_from_bytes(message)
# else:
# message = email.message_from_string(message)
subject = message.get('subject', _('Created from e-mail'))
subject = decode_mail_headers(decodeUnknown(message.get_charset(), subject))
for affix in STRIPPED_SUBJECT_STRINGS: