From c6bbbab4c8c2f443f9321c26080b2c3233fa89b3 Mon Sep 17 00:00:00 2001 From: "Olivier Dony, Christophe Simonis" <> Date: Mon, 28 Jun 2010 20:12:44 +0200 Subject: [PATCH] [IMP] tools.misc: cleanup and fallback mechanism for html2plaintext + other minor cleanup bzr revid: odo@openerp.com-20100628181244-s3djk9c7ycbba9vk --- bin/tools/misc.py | 74 ++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 40 deletions(-) diff --git a/bin/tools/misc.py b/bin/tools/misc.py index 68354189bac..be6cd8ede89 100644 --- a/bin/tools/misc.py +++ b/bin/tools/misc.py @@ -349,35 +349,39 @@ def html2plaintext(html, body_id=None, encoding='utf-8'): """ html = ustr(html) - - try: - from BeautifulSoup import BeautifulSoup, SoupStrainer, Comment - except: - return html - urls = [] + + from lxml.etree import Element, tostring + try: + from lxml.html.soupparser import fromstring + kwargs = {} + except ImportError: + _logger.debug('tools.misc.html2plaintext: cannot use BeautifulSoup, fallback to lxml.etree.HTMLParser') + from lxml.etree import fromstring, HTMLParser + kwargs = dict(parser=HTMLParser()) + + tree = fromstring(html, **kwargs) + if body_id is not None: - strainer = SoupStrainer(id=body_id) + source = tree.xpath('//*[@id=%s]'%(body_id,)) else: - strainer = SoupStrainer('body') - - soup = BeautifulSoup(html, parseOnlyThese=strainer, fromEncoding=encoding) - for link in soup.findAll('a'): - title = link.renderContents() - for url in [x[1] for x in link.attrs if x[0]=='href']: - urls.append(dict(url=ustr(url), tag=ustr(link), title=ustr(title))) - - html = ustr(soup.__str__()) + source = tree.xpath('//body') + if len(source): + tree = source[0] url_index = [] i = 0 - for d in urls: - if d['title'] == d['url'] or 'http://'+d['title'] == d['url']: - html = html.replace(d['tag'], d['url']) - else: + for link in tree.findall('.//a'): + title = link.text + url = link.get('href') + if url: i += 1 - html = html.replace(d['tag'], '%s [%s]' % (d['title'], i)) - url_index.append(d['url']) + urls.append(dict(url=ustr(url), tag=ustr(link), title=ustr(title))) + link.tag = 'span' + link.text = '%s [%s]' % (link.text, i) + url_index.append(url) + + html = ustr(tostring(tree, encoding=encoding)) html = html.replace('','*').replace('','*') html = html.replace('','*').replace('','*') @@ -385,25 +389,15 @@ def html2plaintext(html, body_id=None, encoding='utf-8'): html = html.replace('