1.1 --- a/__init__.py Mon Oct 20 21:14:20 2003 +0000
1.2 +++ b/__init__.py Mon Oct 27 21:46:24 2003 +0000
1.3 @@ -42,7 +42,7 @@
1.4
1.5 def values(self):
1.6 attributes = []
1.7 - _attribute = self.node._node.properties
1.8 + _attribute = self.node.as_native_node().properties
1.9 while _attribute is not None:
1.10 attributes.append(Node(_attribute, ownerElement=self.node))
1.11 _attribute = _attribute.next
1.12 @@ -98,6 +98,9 @@
1.13 self.ownerElement = ownerElement
1.14 self.doctype = doctype
1.15
1.16 + def as_native_node(self):
1.17 + return self._node
1.18 +
1.19 def _ownerDocument(self):
1.20 return Node(self._node.doc)
1.21
1.22 @@ -167,21 +170,15 @@
1.23 return Node(self._node.parent)
1.24
1.25 def hasAttributeNS(self, ns, localName):
1.26 - return self._getAttributeNS(ns, localName) is not None
1.27 + return self.getAttributeNS(ns, localName) is not None
1.28
1.29 def hasAttribute(self, name):
1.30 - return self._getAttribute(name) is not None
1.31 + return self.getAttribute(name) is not None
1.32
1.33 def getAttributeNS(self, ns, localName):
1.34 - return self._getAttributeNS(ns, localName) or ""
1.35 -
1.36 - def _getAttributeNS(self, ns, localName):
1.37 return self._node.nsProp(localName, ns)
1.38
1.39 def getAttribute(self, name):
1.40 - return self._getAttribute(name) or ""
1.41 -
1.42 - def _getAttribute(self, name):
1.43 return self._node.prop(name)
1.44
1.45 def getAttributeNodeNS(self, ns, localName):
1.46 @@ -345,7 +342,7 @@
1.47 return Node(libxml2.parseURI(uri))
1.48
1.49 def toString(node):
1.50 - return node._node.serialize()
1.51 + return node.as_native_node().serialize()
1.52
1.53 def toStream(node, stream=None):
1.54 stream = stream or sys.stdout