summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2016-02-01 22:22:25 +0100
committerJan Pokorný <jpokorny@redhat.com>2016-02-01 23:55:11 +0100
commit6448d8413ef27d0303231eb640bb9cacb3903fdd (patch)
tree4f4a1e7d95a7f25525b2cb87bc6dc6d2d324c711
parenteeb3baa8119383ee28da703721263e655716d4f2 (diff)
downloadclufter-6448d8413ef27d0303231eb640bb9cacb3903fdd.tar.gz
clufter-6448d8413ef27d0303231eb640bb9cacb3903fdd.tar.xz
clufter-6448d8413ef27d0303231eb640bb9cacb3903fdd.zip
filter: use new utils_lxml.etree_parser_safe_unblanking
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
-rw-r--r--filter.py8
-rw-r--r--utils_lxml.py5
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:
# <http://lxml.de/FAQ.html#
# why-doesn-t-the-pretty-print-option-reformat-my-xml-output>
- # 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
+))