dogtail r384 - in trunk: . dogtail

[zcerza svn gnome org]

Author: zcerza
Date: Wed Feb  6 21:30:27 2008
New Revision: 384
URL: http://svn.gnome.org/viewvc/dogtail?rev=384&view=rev

Log:
* dogtail/dump.py: Properly print Node.actions; ditch "xml" output as
it was not even really a good start.

* dogtail/tree.py: Strip some useless information of out
Action.__str__().


Modified:
   trunk/ChangeLog
   trunk/dogtail/dump.py
   trunk/dogtail/tree.py

Modified: trunk/dogtail/dump.py
==============================================================================
--- trunk/dogtail/dump.py	(original)
+++ trunk/dogtail/dump.py	Wed Feb  6 21:30:27 2008
@@ -11,7 +11,7 @@
     """
     print spacer*(depth) + str (node)
     try:
-        for action in node.actions:
+        for action in node.actions.values():
             print spacer*(depth + 1) + str (action)
     except AttributeError: pass
     try:
@@ -19,39 +19,3 @@
             plain (child, depth + 1)
     except AttributeError: pass
 
-def xml (node):
-    try: import cElementTree as ElementTree
-    except ImportError: from elementtree import ElementTree
-    def buildElementTree (parentElement, node):
-        element = ElementTree.SubElement(parentElement, 'node')
-        name = ElementTree.SubElement(element, 'name')
-        name.text = node.name
-        roleName = ElementTree.SubElement(element, 'roleName')
-        roleName.text = node.roleName
-        description = ElementTree.SubElement(element, 'description')
-        description.text = node.description
-        try:
-            text = ElementTree.SubElement(element, 'text')
-            text.text = node.text
-        except AttributeError: pass
-
-        try:
-            for action in node.actions:
-                actionElement = ElementTree.SubElement(element, 'action')
-                name = ElementTree.SubElement(actionElement, 'name')
-                name.text = action.name
-                description = ElementTree.SubElement(actionElement, 'description')
-                description.text = action.description
-                keyBinding = ElementTree.SubElement(actionElement, 'keyBinding')
-                keyBinding.text = action.keyBinding
-        except AttributeError: pass
-
-        try:
-            for child in node.children:
-                buildElementTree(element, child)
-        except AttributeError: pass
-    root = ElementTree.Element('node')
-    element = root
-    buildElementTree(root, node)
-    tree = ElementTree.ElementTree(root)
-    ElementTree.dump(tree)

Modified: trunk/dogtail/tree.py
==============================================================================
--- trunk/dogtail/tree.py	(original)
+++ trunk/dogtail/tree.py	Wed Feb  6 21:30:27 2008
@@ -151,8 +151,8 @@
     keyBinding = property(_getKeyBinding)
 
     def __str__ (self):
-        return "[action | %s | %s | %s | %s]" % \
-            (self.__index, self.name, self.description, self.keyBinding)
+        return "[action | %s | %s ]" % \
+            (self.name, self.keyBinding)
 
     def do (self):
         """