holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix errors in Python 2, used six to workaround encoding weirdness, all tests pass on both Py2/3

Browse Source
This commit is contained in:
Garret Wassermann 2017-04-03 02:52:49 -04:00
parent 5ec985af9b
commit 9531b9649a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,7 +254,7 @@ def decodeUnknown(charset, string):
def decode_mail_headers(string): def decode_mail_headers(string):
decoded = email.header.decode_header(string) decoded = email.header.decode_header(string) if six.PY3 else email.header.decode_header(string.encode('utf-8'))
if six.PY2: if six.PY2:
return u' '.join([unicode(msg, charset or 'utf-8') for msg, charset in decoded]) return u' '.join([unicode(msg, charset or 'utf-8') for msg, charset in decoded])
elif six.PY3: elif six.PY3:
@ -263,7 +263,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) message = email.message_from_string(message) if six.PY3 else email.message_from_string(message.encode('utf-8'))
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:
@ -309,7 +309,7 @@ def ticket_from_message(message, queue, logger):
decodeUnknown(part.get_content_charset(), part.get_payload(decode=True)) decodeUnknown(part.get_content_charset(), part.get_payload(decode=True))
) )
# workaround to get unicode text out rather than escaped text # workaround to get unicode text out rather than escaped text
body = body.encode('ascii').decode('unicode_escape') body = body.encode('ascii').decode('unicode_escape') if six.PY3 else body.encode('utf-8')
logger.debug("Discovered plain text MIME part") logger.debug("Discovered plain text MIME part")
else: else:
files.append( files.append(