From 630e9ad64ce9d493104cb187c76248d8441ff751 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 9 Dec 2013 19:54:06 +0100 Subject: [PATCH] [FIX] Don't remove data-... attributes like data-snippet-id bzr revid: fp@tinyerp.com-20131209185406-newaf16v532l146p --- openerp/tools/mail.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py index 1169eb86026..b7eab3669a9 100644 --- a/openerp/tools/mail.py +++ b/openerp/tools/mail.py @@ -75,22 +75,15 @@ def html_sanitize(src, silent=True): else: kwargs['remove_tags'] = tags_to_kill + tags_to_remove - if etree.LXML_VERSION >= (3, 1, 0): - kwargs.update({ - 'safe_attrs_only': True, - 'safe_attrs': safe_attrs, - }) - else: - # lxml < 3.1.0 does not allow to specify safe_attrs. We keep all attributes in order to keep "style" - kwargs['safe_attrs_only'] = False + kwargs['safe_attrs_only'] = False try: # some corner cases make the parser crash (such as in test_mail) cleaner = clean.Cleaner(**kwargs) cleaned = cleaner.clean_html(src) except etree.ParserError, e: - if 'empty' in str(e): - return "" + if 'empty' in str(e): + return "" if not silent: raise logger.warning('ParserError obtained when sanitizing %r', src, exc_info=True)