1.1 --- a/libxml2dom/macrolib/macrolib.py Fri Jun 20 21:42:35 2008 +0200
1.2 +++ b/libxml2dom/macrolib/macrolib.py Thu Oct 20 14:01:17 2005 +0000
1.3 @@ -45,11 +45,14 @@
1.4 "text" : xml.dom.Node.TEXT_NODE
1.5 }
1.6
1.7 +_reverseNodeTypes = {}
1.8 +for label, value in _nodeTypes.items():
1.9 + _reverseNodeTypes[value] = label
1.10 +
1.11 def Node_ownerDocument(node):
1.12 return libxml2mod.doc(node) or node
1.13
1.14 def Node_nodeType(node):
1.15 - global _nodeTypes
1.16 return _nodeTypes[libxml2mod.type(node)]
1.17
1.18 def Node_childNodes(node):
1.19 @@ -282,7 +285,7 @@
1.20 elif Node_nodeType(other) == xml.dom.Node.COMMENT_NODE:
1.21 return Node_createComment(node, Node_data(other))
1.22
1.23 - raise ValueError, Node_nodeType(other)
1.24 + raise ValueError, "Node type '%s' (%d) not supported." % (other, Node_nodeType(other))
1.25
1.26 def Node_importNode_DOM(node, other, deep):
1.27 if other.nodeType == xml.dom.Node.ELEMENT_NODE:
1.28 @@ -304,7 +307,7 @@
1.29 elif other.nodeType == xml.dom.Node.COMMENT_NODE:
1.30 return Node_createComment(node, other.data)
1.31
1.32 - raise ValueError, other.nodeType
1.33 + raise ValueError, "Node type '%s' (%d) not supported." % (_reverseNodeTypes[other.nodeType], other.nodeType)
1.34
1.35 def Node_xpath(node, expr, variables=None, namespaces=None):
1.36 context = libxml2mod.xmlXPathNewContext(Node_ownerDocument(node))