From 7561d80d6b5f410994600ce770d3ee3fbb960d00 Mon Sep 17 00:00:00 2001 From: Naresh Choksy Date: Mon, 25 May 2009 12:12:45 +0530 Subject: [PATCH] added functionality to handle comment Node bzr revid: nch@tinyerp.com-20090525064245-swbzaetxrmgm32zo --- bin/report/preprocess.py | 2 ++ bin/report/render/rml2pdf/trml2pdf.py | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/bin/report/preprocess.py b/bin/report/preprocess.py index 441df892c1c..0f026bce003 100644 --- a/bin/report/preprocess.py +++ b/bin/report/preprocess.py @@ -12,6 +12,8 @@ class report(object): _regex2 = re.compile("\[\[(.*?)(removeParentNode\(\s*(?:['\"](.*?)['\"])\s*\))(.*?)\]\]") _regex3 = re.compile("\[\[\s*(.*?setTag\(\s*['\"](.*?)['\"]\s*,\s*['\"].*?['\"]\s*(?:,.*?)?\).*?)\s*\]\]") for node in root_node: + if node.tag == etree.Comment: + continue if node.text: def _sub3(txt): n = node diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py index 3a000565fb0..96c8004d7a1 100644 --- a/bin/report/render/rml2pdf/trml2pdf.py +++ b/bin/report/render/rml2pdf/trml2pdf.py @@ -495,6 +495,9 @@ class _rml_flowable(object): flow = [] for n in utils._child_get(td, self): + if n.tag == etree.Comment: + n.text = '' + continue fl = self._flowable(n, extra_style=paraStyle) if isinstance(fl,list): flow += fl @@ -676,6 +679,9 @@ class _rml_flowable(object): def process_story(node_story): sub_story = [] for node in utils._child_get(node_story, self): + if node.tag == etree.Comment: + node.text = '' + continue flow = self._flowable(node) if flow: if isinstance(flow,list):