extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2024-12-14 02:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

merged with upstream

Browse Source
This commit is contained in:
Pawel M 2016-12-12 11:07:08 +01:00
commit 556b6900db
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,13 +264,7 @@ def decode_mail_headers(string):
def ticket_from_message(message, queue, logger): def ticket_from_message(message, queue, logger):
# 'message' must be an RFC822 formatted message. # 'message' must be an RFC822 formatted message.
# if six.PY2:
message = email.message_from_string(message) 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 = 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: