From 6448d8413ef27d0303231eb640bb9cacb3903fdd Mon Sep 17 00:00:00 2001 From: Jan Pokorný Date: Mon, 1 Feb 2016 22:22:25 +0100 Subject: filter: use new utils_lxml.etree_parser_safe_unblanking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Pokorný --- filter.py | 8 ++++---- utils_lxml.py | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/filter.py b/filter.py index ca9b214..3499124 100644 --- a/filter.py +++ b/filter.py @@ -32,7 +32,8 @@ from .utils import args2tuple, arg2wrapped, \ filterdict_keep, filterdict_invkeep, filterdict_pop, \ head_tail, hybridproperty, \ identity, lazystring, tuplist -from .utils_lxml import etree_XSLT_safe, etree_parser_safe +from .utils_lxml import etree_XSLT_safe, \ + etree_parser_safe, etree_parser_safe_unblanking from .utils_func import apply_preserving_depth, \ apply_aggregation_preserving_depth, \ apply_intercalate, \ @@ -1008,9 +1009,8 @@ class XMLFilter(Filter, MetaPlugin): if not raw and not textmode: # - # XXX we could use a single shared un-blanking parser around - parser = etree.XMLParser(remove_blank_text=True) - ret = etree.fromstring(etree.tostring(ret), parser) + ret = etree.fromstring(etree.tostring(ret), + parser=etree_parser_safe_unblanking) elif textmode: ret = str(ret) return ret diff --git a/utils_lxml.py b/utils_lxml.py index 2221fab..098dfd9 100644 --- a/utils_lxml.py +++ b/utils_lxml.py @@ -18,3 +18,8 @@ etree_parser_safe_kwargs = dict( ) etree_parser_safe = etree.XMLParser(**etree_parser_safe_kwargs) + +etree_parser_safe_unblanking = etree.XMLParser(**dict( + remove_blank_text=True, + **etree_parser_safe_kwargs +)) -- cgit