holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2025-02-16 18:20:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary imports, clean up python3 handling code to use native str()

Browse Source
This commit is contained in:
Garret Wassermann 2016-09-15 22:51:00 -04:00
parent e5c3c4a435
commit a4ad602f39
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,10 +10,8 @@ scripts/get_email.py - Designed to be run from cron, this script checks the
helpdesk, creating tickets from the new messages (or helpdesk, creating tickets from the new messages (or
adding to existing tickets if needed) adding to existing tickets if needed)
""" """
from __future__ import print_function
import email import email
import codecs
import imaplib import imaplib
import mimetypes import mimetypes
import poplib import poplib
@ -244,10 +242,10 @@ def decodeUnknown(charset, string):
if type(string) is not str: if type(string) is not str:
if not charset: if not charset:
try: try:
return codecs.decode(bytes(string),'utf-8','ignore') return str(string,encoding='utf-8',errors='replace')
except: except:
return codecs.decode(bytes(string),'iso8859-1','ignore') return str(string,encoding='iso8859-1',errors='replace')
return str(string, charset) return str(string,encoding=charset)
return string return string
def decode_mail_headers(string): def decode_mail_headers(string):
@ -255,7 +253,7 @@ def decode_mail_headers(string):
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:
return u' '.join([str(msg) for msg, charset in decoded]) return u' '.join([str(msg,encoding=charset,errors='replace') if charset else str(msg) for msg, charset in decoded])
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.