summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun McCance <shaunm@gnome.org>2013-10-27 13:45:12 -0400
committerShaun McCance <shaunm@gnome.org>2013-10-27 13:45:12 -0400
commit45872e7e4252aadd0fc304ab3c9d1d740c690b5f (patch)
tree2c29418e693e56bd6b8810dc8ed00672b5306b4b
parent29d6a9ea85c8fb939b4fdaabb92e08eb42bfdefc (diff)
downloaditstool-45872e7e4252aadd0fc304ab3c9d1d740c690b5f.tar.gz
Fixed issue with preserveSpace from xml:space attribute
-rwxr-xr-xitstool.in15
1 files changed, 7 insertions, 8 deletions
diff --git a/itstool.in b/itstool.in
index dcd4177..4d2d605 100755
--- a/itstool.in
+++ b/itstool.in
@@ -625,7 +625,7 @@ class Document (object):
nodenote = LocNote(locnoteref=note.content, locnotetype=notetype)
else:
nodenote = LocNote(locnote=note.content, locnotetype=notetype,
- space=self.get_preserve_space(note))
+ space=self.get_preserve_space(note))
self._its_loc_notes.setdefault(node, []).append(nodenote)
break
xpath.setContextNode(oldnode)
@@ -1139,13 +1139,12 @@ class Document (object):
return len([child for child in xml_child_iter(node) if child.type=='element'])
def get_preserve_space (self, node):
- if node.getSpacePreserve() == 1:
- return True
- else:
- while node.type == 'element':
- if self._its_preserve_space_nodes.has_key(node):
- return (self._its_preserve_space_nodes[node] == 'preserve')
- node = node.parent
+ while node.type in ('attribute', 'element'):
+ if node.getSpacePreserve() == 1:
+ return True
+ if self._its_preserve_space_nodes.has_key(node):
+ return (self._its_preserve_space_nodes[node] == 'preserve')
+ node = node.parent
return False
def get_its_translate(self, node):