From a74d50d220b26f26a37faeb59e8923f1e635c2ea Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 27 Dec 2012 17:33:24 +0100 Subject: [PATCH] [IMP] support for lxml <2.3.1 bzr revid: fp@tinyerp.com-20121227163324-uloesoeixirmdtka --- openerp/tools/mail.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py index 10656e9797c..f1bb5a7a7ff 100644 --- a/openerp/tools/mail.py +++ b/openerp/tools/mail.py @@ -48,11 +48,15 @@ def html_sanitize(src): if not src: return src src = ustr(src, errors='replace') - # some corner cases make the parser crash (such as in test_mail) try: cleaner = clean.Cleaner(page_structure=True, style=False, safe_attrs_only=False, forms=False, kill_tags=tags_to_kill, remove_tags=tags_to_remove) cleaned = cleaner.clean_html(src) + except TypeError, e: + # lxml.clean version < 2.3.1 does not have a kill_tags attribute + # to remove in 2014 + cleaner = clean.Cleaner(page_structure=True, style=False, safe_attrs_only=False, forms=False, remove_tags=tags_to_kill+tags_to_remove) + cleaned = cleaner.clean_html(src) except: _logger.warning('html_sanitize failed to parse %s' % (src)) cleaned = '

Impossible to parse

'