holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix formatting per flake8

Browse Source
This commit is contained in:
chrisbroderick 2022-09-08 22:11:24 +01:00
parent b78be0d71f
commit 8d7ba415fa
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
helpdesk/email.py
View File

@ -212,7 +212,7 @@ def imap_sync(q, logger, server):
"Successfully processed message %s, deleted from IMAP server" % num)
else:
logger.warn(
"Message %s was not successfully processed, and will be left on IMAP server" % num)
"Message %s was not successfully processed, and will be left on IMAP server" % num)
except imaplib.IMAP4.error:
logger.error(
"IMAP retrieve failed. Is the folder '%s' spelled correctly, and does it exist on the server?",
@ -595,20 +595,22 @@ def get_email_body_from_part_payload(part) -> str:
part.get_payload(decode=False)
)
def attempt_body_extract_from_html(message: str) -> str:
mail = BeautifulSoup(str(message), "html.parser")
beautiful_body = mail.find('body')
body = None
full_body = None
if beautiful_body:
try:
body = beautiful_body.text
full_body = body
except AttributeError:
pass
if not body:
body = ""
return body, full_body
mail = BeautifulSoup(str(message), "html.parser")
beautiful_body = mail.find('body')
body = None
full_body = None
if beautiful_body:
try:
body = beautiful_body.text
full_body = body
except AttributeError:
pass
if not body:
body = ""
return body, full_body
def extract_part_data(
part: Message,
@ -616,7 +618,7 @@ def extract_part_data(
ticket_id: int,
files: List,
logger: logging.Logger
) -> Tuple[str, str]:
) -> Tuple[str, str]:
name = part.get_filename()
if name:
name = email.utils.collapse_rfc2231_value(name)
@ -682,6 +684,7 @@ def extract_part_data(
logger.debug("Found MIME attachment %s", name)
return part_body, part_full_body
def object_from_message(message: str,
queue: Queue,
logger: logging.Logger