From 91faa847187168137790f3522774c0013d13fa2d Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Wed, 20 Nov 2013 07:57:01 +0400 Subject: [PATCH] Fix a bug in handling comments --- xml | 13 ++++++++----- xml-ANNOUNCE | 3 +++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/xml b/xml index 15ef711..3d40d37 100755 --- a/xml +++ b/xml @@ -21,9 +21,12 @@ comments are represented as text files; attributes are shown in a file named deliberately ignore a small chance of newline characters in values); names and values are reencoded to the console encoding. Text nodes and comments are collected in a file named "text", stripped and reencoded. The filesystem is -read-only. ElementTree-based implementation doesn't show namespaces as -attributes; lxml.etree-based implementation shows namespaces as a separate file -"namespaces"; every child tag includes its parent's namespaces. +read-only. + +Implementation based on minidom doesn't understand namespaces, it just shows +them among other attributes. ElementTree-based implementation doesn't show +namespaces at all. Implementation based on lxml.etree shows namespaces in a +separate file "namespaces"; every child tag includes its parent's namespaces. It is useful to have a top-down view on an XML structure but it's especially convenient to extract text values from tags. One can get, for example, a @@ -34,7 +37,7 @@ The VFS was inspired by a FUSE xmlfs: https://github.com/halhen/xmlfs """ -__version__ = "0.5.0" +__version__ = "0.5.1" __author__ = "Oleg Broytman " __copyright__ = "Copyright (C) 2013 PhiloSoft Design" __license__ = "GPL" @@ -213,7 +216,7 @@ if use_elementtree or use_lxml: if text: text_accumulator.append(text) for element in node: if not self.istag(element): - text = u"" % text + text = u"" % element.text text_accumulator.append(text) if node.tail: text = node.tail.strip() diff --git a/xml-ANNOUNCE b/xml-ANNOUNCE index e709e53..263f1d9 100644 --- a/xml-ANNOUNCE +++ b/xml-ANNOUNCE @@ -5,6 +5,9 @@ WHAT IS IT View an XML file in Midnight Commander as a filesystem. +WHAT'S NEW in version 0.5.1 (2013-11-20) + Fixed a bug in handling comments. + WHAT'S NEW in version 0.5.0 (2013-11-19) Added lxml.etree-based implementation. -- 2.39.5