From 50f09660fb7b8a8b9cd89ea6385274b9ccb80a3b Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 20 Nov 2012 14:40:01 +0100 Subject: [PATCH] [FIX] tools mail: html_email_clean return False (standard OpenERP) if the param is False bzr revid: chm@openerp.com-20121120134001-ivw9dqxha2du70o6 --- openerp/tests/test_mail.py | 2 +- openerp/tools/mail.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/tests/test_mail.py b/openerp/tests/test_mail.py index edf5571ca20..a8c806a13d0 100644 --- a/openerp/tests/test_mail.py +++ b/openerp/tests/test_mail.py @@ -175,7 +175,7 @@ class TestCleaner(unittest2.TestCase): # Test5: False boolean for text must return empty string new_html = html_email_clean(False) - self.assertEqual(new_html, '', 'html_email_cleaner did not change a False (boolean) in an empty string.') + self.assertEqual(new_html, False, 'html_email_cleaner did change a False in an other value.') class TestHtmlTools(unittest2.TestCase): """ Test some of our generic utility functions about html """ diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py index 6a10731281c..9faae0815c5 100644 --- a/openerp/tools/mail.py +++ b/openerp/tools/mail.py @@ -131,7 +131,7 @@ def html_email_clean(html): return dest if not html: - return '' + return False html = ustr(html)