extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-01-31 10:29:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Address bytes/str issue with POP3 email in get_email script, to address #565

Browse Source
This commit is contained in:
Garret Wassermann 2017-10-31 01:24:26 -04:00
parent 1bd88c0f4f
commit 8f375e1379
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,7 +158,17 @@ def process_queue(q, logger):
messagesInfo = server.list()[1] messagesInfo = server.list()[1]
logger.info("Received %d messages from POP3 server" % len(messagesInfo)) logger.info("Received %d messages from POP3 server" % len(messagesInfo))
for msg in messagesInfo: for msgRaw in messagesInfo:
if six.PY3:
# in py3, msgRaw is a bytes object, decode to str
try:
msg = msgRaw.decode("utf-8")
except:
# if couldn't decode easily, just leave it raw
msg = msgRaw
else:
# in py2, already a str
msg = msgRaw
msgNum = msg.split(" ")[0] msgNum = msg.split(" ")[0]
logger.info("Processing message %s" % msgNum) logger.info("Processing message %s" % msgNum)