diff options
| author | Naresh Choksy <nch@tinyerp.com> | 2009-06-26 14:24:16 +0530 |
|---|---|---|
| committer | Naresh Choksy <nch@tinyerp.com> | 2009-06-26 14:24:16 +0530 |
| commit | af536b3632e0e301a5a13fa45fbeb088fa47bd45 (patch) | |
| tree | 37fd8e46ad5ef88d0285a32d0d5f86058ac84bc7 /bin/report/render/html2html/html2html.py | |
| parent | 0727fa9c373dcd5dc99772ba89c6c78d567857c4 (diff) | |
| parent | 655eada141079901ef8fb16eea5890a92db19608 (diff) | |
[MERGE]
bzr revid: nch@tinyerp.com-20090615063904-3gxvznxzt2lfdxys
bzr revid: nch@tinyerp.com-20090616093700-63rzyb48i1ebm0kr
bzr revid: nch@tinyerp.com-20090616094232-cex5n60a1sfzi8zg
bzr revid: nch@tinyerp.com-20090626085416-tn0inoeb1qhmndnl
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) |