From 9bf7d618d85a4dbeb23b48628706a9b12358a094 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Thu, 22 Mar 2012 21:55:34 +0100 Subject: [PATCH] don't crash if a message content is None --- modules/aum/antispam.py | 3 +++ modules/aum/backend.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/aum/antispam.py b/modules/aum/antispam.py index a5b1ab09..236425a5 100644 --- a/modules/aum/antispam.py +++ b/modules/aum/antispam.py @@ -128,6 +128,9 @@ class AntiSpam(object): def check_mail(self, mail): # Spambot with a long first-message. + if mail['message'] is None: + return True + if mail['message'].find('Je veux que vous m\'ayez ecrit directement sur le mon e-mail') >= 0: return False if mail['message'].find('ilusa12010@live.fr') >= 0: diff --git a/modules/aum/backend.py b/modules/aum/backend.py index 8d1e2399..e27d3e71 100644 --- a/modules/aum/backend.py +++ b/modules/aum/backend.py @@ -218,7 +218,7 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh sender=my_name if int(mail['id_from']) == self.browser.my_id else mails['member']['pseudo'], receivers=[my_name if int(mail['id_from']) != self.browser.my_id else mails['member']['pseudo']], date=parse_dt(mail['date']), - content=unescape(mail['message']).strip(), + content=unescape(mail['message'] or '').strip(), signature=signature, children=[], flags=flags)