minor update

stamparm · stamparm · commit 2de3081b5075 · 2010-10-21T23:03:42.000Z
diff --git a/extra/xmlobject/xmlobject.py b/extra/xmlobject/xmlobject.py
@@ -425,6 +425,12 @@ def _has_key(self, k):
         """
         return self._node.hasAttribute(k) or self._childrenByName.has_key(k)
 
+    def _get_name(self):
+        if self._type == "node":
+            return self._node.nodeName
+        else:
+            return self._type
+
     def _get(self, k, default=None):
         """
         returns the value of attribute k, or default if no such attribute
@@ -433,6 +439,7 @@ def _get(self, k, default=None):
             return getattr(self, k)
         else:
             return default
+
     def __len__(self):
         """
         returns number of child nodes
@@ -538,3 +545,15 @@ def _toxml(self):
         """
         return self._node.toxml()
 
+    def _treeWalker(self, node, nodes):
+        for child in node._children:
+            if child._type == 'node':
+                nodes.append(child)
+                self._treeWalker(child, nodes)
+
+    def _toflat(self):
+        ret = [self]
+        self._treeWalker(self, ret)
+        return ret
+
+    _name = property(_get_name)
