diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2009-06-18 22:33:11 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2009-06-18 22:33:11 +0200 |
| commit | 51dd8dff0e3ecd8e806b519dcf3c681886a36e81 (patch) | |
| tree | 83d354de35b23545b6ddcc6cdbf8ca529a776bd6 /bin/report/render/html2html/html2html.py | |
| parent | 185df210a8b697da0087657ac23485d4dbe55cbd (diff) | |
| parent | 12434e7292d8c861581f3a8a206201afa32e21fa (diff) | |
merge
bzr revid: fp@tinyerp.com-20090618203311-4srit4hhu3h9hk8p
Diffstat (limited to 'bin/report/render/html2html/html2html.py')
| -rw-r--r-- | bin/report/render/html2html/html2html.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/report/render/html2html/html2html.py b/bin/report/render/html2html/html2html.py index db6a1ea511c..fa07e9b4726 100644 --- a/bin/report/render/html2html/html2html.py +++ b/bin/report/render/html2html/html2html.py @@ -30,7 +30,7 @@ import re from reportlab.lib.utils import ImageReader _regex = re.compile('\[\[(.+?)\]\]') - +utils._regex = re.compile('\[\[\s*(.+?)\s*\]\]',re.DOTALL) class html2html(object): def __init__(self, html, localcontext): self.localcontext = localcontext @@ -48,6 +48,7 @@ class html2html(object): if len(child): for n in new_child: new_child.text = utils._process_text(self, child.text) + new_child.tail = utils._process_text(self, child.tail) new_child.remove(n) process_text(child, new_child) else: @@ -66,6 +67,7 @@ class html2html(object): else : new_child.getparent().remove(new_child) new_child.text = utils._process_text(self, child.text) + new_child.tail = utils._process_text(self, child.tail) self._node = copy.deepcopy(self.etree) for n in self._node: self._node.remove(n) |