From 7386a45784db7c945b843a36db945f077020b61e Mon Sep 17 00:00:00 2001 From: andresf01 Date: Tue, 11 Jul 2017 10:09:47 -0500 Subject: [PATCH] Fixed encoding error in get_email --- helpdesk/management/commands/get_email.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/helpdesk/management/commands/get_email.py b/helpdesk/management/commands/get_email.py index 999fc17d..ac0acdf4 100755 --- a/helpdesk/management/commands/get_email.py +++ b/helpdesk/management/commands/get_email.py @@ -323,7 +323,10 @@ def ticket_from_message(message, queue, logger): decodeUnknown(part.get_content_charset(), part.get_payload(decode=True)) ) # workaround to get unicode text out rather than escaped text - body = body.encode('ascii').decode('unicode_escape') if six.PY3 else body.encode('utf-8') + try: + body = body.encode('ascii').decode('unicode_escape') + except UnicodeEncodeError: + body.encode('utf-8') logger.debug("Discovered plain text MIME part") else: files.append(