Don't crash when mail body is empty

2018-12-19 17:12:46 +01:00 · 2018-12-19 17:12:46 +01:00 · e66c42890c
commit e66c42890c
parent c3746ce7b0
1 changed files with 7 additions and 5 deletions
--- a/helpdesk/email.py
+++ b/helpdesk/email.py
@ -362,11 +362,13 @@ def ticket_from_message(message, queue, logger):

    if not body:
        mail = BeautifulSoup(part.get_payload(), "lxml")
-        if ">" in mail.text:
-            body = mail.find('body')
-            body = body.text
-            body = body.encode('ascii', errors='ignore')
-        else:
+        beautiful_body = mail.find('body')
+        if beautiful_body:
+            try:
+                body = beautiful_body.text
+            except AttributeError:
+                pass
+        if not body:
            body = mail.text

    if ticket: