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

PY3 support and msgNum error solved in process_queue method

Browse Source
This commit is contained in:
Pawel M 2016-12-08 09:32:04 +01:00
parent 6908e956e0
commit 905910911d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,9 +205,9 @@ def process_queue(q, logger):
ticket = ticket_from_message(message=encoding.smart_text(data[0][1]), queue=q, logger=logger)
if ticket:
server.store(num, '+FLAGS', '\\Deleted')
logger.info("Successfully processed message %s, deleted from IMAP server" % num)
logger.info("Successfully processed message %s, deleted from IMAP server" % str(num))
else:
logger.warn("Message %s was not successfully processed, and will be left on IMAP server" % num)
logger.warn("Message %s was not successfully processed, and will be left on IMAP server" % str(num))
server.expunge()
server.close()
@ -264,7 +264,11 @@ def decode_mail_headers(string):
def ticket_from_message(message, queue, logger):
# 'message' must be an RFC822 formatted message.
message = email.message_from_string(message)
msg = message
if six.PY2:
message = email.message_from_string(msg)
elif six.PY3:
message = email.message_from_bytes(msg)
subject = message.get('subject', _('Created from e-mail'))
subject = decode_mail_headers(decodeUnknown(message.get_charset(), subject))
for affix in STRIPPED_SUBJECT_STRINGS: