holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests 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 1f63691dbe
commit d76fa2c71e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,9 +214,9 @@ def process_queue(q, logger):
ticket = ticket_from_message(message=data[0][1], queue=q, logger=logger) ticket = ticket_from_message(message=data[0][1], queue=q, logger=logger)
if ticket: if ticket:
server.store(num, '+FLAGS', '\\Deleted') server.store(num, '+FLAGS', '\\Deleted')
logger.info("Successfully processed message %s, deleted from IMAP server" % str(msgNum)) logger.info("Successfully processed message %s, deleted from IMAP server" % str(num))
else: else:
logger.warn("Message %s was not successfully processed, and will be left on IMAP server" % str(msgNum)) logger.warn("Message %s was not successfully processed, and will be left on IMAP server" % str(num))
server.expunge() server.expunge()
server.close() server.close()
@ -271,7 +271,10 @@ 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.
msg = message msg = message
message = email.message_from_string(msg) 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 = 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: