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

Wrap message.encode() in conditional for Python 2

Browse Source
This commit is contained in:
Michael Huang 2017-02-14 14:58:16 -08:00
parent f16a196c69
commit b263b22cca
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,7 +260,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.
message = email.message_from_string(message.encode('utf-8')) message = email.message_from_string(message.encode('utf-8') if six.PY2 else 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: