X-Git-Url: https://git.phdru.name/?p=extfs.d.git;a=blobdiff_plain;f=xml;h=5ed82db406ae9a061a733b046c0f050102adc9df;hp=3d40d375e081a976a2b9c55d0572c564223e78f3;hb=7333a3485fd782d8f7b3850e88f649d75afd505d;hpb=91faa847187168137790f3522774c0013d13fa2d diff --git a/xml b/xml index 3d40d37..5ed82db 100755 --- a/xml +++ b/xml @@ -42,8 +42,8 @@ __author__ = "Oleg Broytman " __copyright__ = "Copyright (C) 2013 PhiloSoft Design" __license__ = "GPL" -default_implementation = None # Can be None for default choice, - # 'lxml', 'elementtree' or 'minidom' +default_implementation = None # Can be None for default choice, + # 'lxml', 'elementtree' or 'minidom' use_minidom = True use_elementtree = False @@ -143,7 +143,7 @@ class MiniDOMXmlVfs(XmlVfs): def attrs2text(self, node): attrs = node.attributes - attrs = [attrs.item(i) for i in range (attrs.length)] + attrs = [attrs.item(i) for i in range(attrs.length)] return '\n'.join(["%s=%s" % (a.name.encode(default_encoding, "replace"), a.value.encode(default_encoding, "replace")) @@ -170,7 +170,7 @@ class MiniDOMXmlVfs(XmlVfs): if element.localName: n += 1 if n: - width = int(math.log10(n))+1 + width = int(math.log10(n)) + 1 template = "%%0%dd" % width else: template = "%d" @@ -240,26 +240,26 @@ if use_elementtree: class PIParser(ET.XMLTreeBuilder): - def __init__(self): - ET.XMLTreeBuilder.__init__(self) - # assumes ElementTree 1.2.X - self._parser.CommentHandler = self.handle_comment - self._parser.ProcessingInstructionHandler = self.handle_pi - self._target.start("document", {}) - - def close(self): - self._target.end("document") - return ET.XMLTreeBuilder.close(self) - - def handle_comment(self, data): - self._target.start(ET.Comment, {}) - self._target.data(data) - self._target.end(ET.Comment) - - def handle_pi(self, target, data): - self._target.start(ET.PI, {}) - self._target.data(target + " " + data) - self._target.end(ET.PI) + def __init__(self): + ET.XMLTreeBuilder.__init__(self) + # assumes ElementTree 1.2.X + self._parser.CommentHandler = self.handle_comment + self._parser.ProcessingInstructionHandler = self.handle_pi + self._target.start("document", {}) + + def close(self): + self._target.end("document") + return ET.XMLTreeBuilder.close(self) + + def handle_comment(self, data): + self._target.start(ET.Comment, {}) + self._target.data(data) + self._target.end(ET.Comment) + + def handle_pi(self, target, data): + self._target.start(ET.PI, {}) + self._target.data(target + " " + data) + self._target.end(ET.PI) self.document = ET.parse(sys.argv[2], PIParser())