odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] tools: mail: use beautifulsoup parser, if not present, html parser. 

bzr revid: tde@openerp.com-20121106133751-ds0g2c7k8pu4d6rl
This commit is contained in:
Thibault Delavallée 2012-11-06 14:37:51 +01:00
parent f2d53fd215
commit a80fab6303
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openerp/tools/mail.py
View File

@ -19,8 +19,11 @@
#
##############################################################################
from lxml.html.soupparser import fromstring
from lxml.etree import tostring
from lxml.etree import tostring, Element
try:
from lxml.html.soupparser import fromstring as parser_fromstring
except ImportError:
from lxml.html import fromstring as parser_fromstring
import logging
import lxml.html
import openerp.pooler as pooler
@ -124,10 +127,10 @@ def html_email_clean(html):
modified_html += html[idx:]
# 2. form a tree, handle (currently ?) pure-text by enclosing them in a pre
root = fromstring(modified_html)
root = parser_fromstring(modified_html)
if not len(root) and root.text is None and root.tail is None:
modified_html = '<div>%s</div>' % modified_html
root = fromstring(modified_html)
root = parser_fromstring(modified_html)
# 3. remove blockquotes
quotes = [el for el in root.iterchildren(tag='blockquote')]