Author: laukpe
Date: Mon Nov 24 01:39:11 2008
New Revision: 1071
Modified:
trunk/src/robot/utils/abstractdomwrapper.py
trunk/src/robot/utils/javadomwrapper.py
trunk/src/robot/utils/minidomwrapper.py
Log:
don't pass node to AbstractDomWrapper because different XML readers have
different nodes anyway
Modified: trunk/src/robot/utils/abstractdomwrapper.py
==============================================================================
--- trunk/src/robot/utils/abstractdomwrapper.py (original)
+++ trunk/src/robot/utils/abstractdomwrapper.py Mon Nov 24 01:39:11 2008
@@ -20,10 +20,10 @@
"""Base class for pydomwrapper.DomWrapper and
jydomwrapper.DomWrapper"""
- def __init__(self, node, path):
+ def __init__(self, path):
"""Public attributes. These must be set by extending classes."""
self.source = path
- self.name = node.tagName
+ self.name = ''
self.attrs = {}
self.text = ''
self.children = []
Modified: trunk/src/robot/utils/javadomwrapper.py
==============================================================================
--- trunk/src/robot/utils/javadomwrapper.py (original)
+++ trunk/src/robot/utils/javadomwrapper.py Mon Nov 24 01:39:11 2008
@@ -33,9 +33,9 @@
Alternative initialization by giving dom 'node' ment to be used
only
internallly.
"""
+ AbstractDomWrapper.__init__(self, path)
if node is None:
node = self._get_root(path, string)
- AbstractDomWrapper.__init__(self, node, path)
self.name = node.tagName
for item in self._create_list(node.attributes):
self.attrs[item.name] = item.value
Modified: trunk/src/robot/utils/minidomwrapper.py
==============================================================================
--- trunk/src/robot/utils/minidomwrapper.py (original)
+++ trunk/src/robot/utils/minidomwrapper.py Mon Nov 24 01:39:11 2008
@@ -33,9 +33,9 @@
internally. 'path' may actually also be an already opened file
object
(or anything accepted by minidom.parse).
"""
+ AbstractDomWrapper.__init__(self, path)
if node is None:
node = self._get_root(path, string)
- AbstractDomWrapper.__init__(self, node, path)
self.name = node.tagName
self.attrs = dict(node.attributes.items())
for child in node.childNodes:
