move toxml to a consistent place (after __unicode__) in every class

annevk · annevk · commit 6f2cf48f8e2a · 2007-01-12T21:25:56.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40468
diff --git a/src/treebuilders/simpletree.py b/src/treebuilders/simpletree.py
@@ -13,6 +13,9 @@ def __init__(self, name):
     def __unicode__(self):
         return self.name
 
+    def toxml(self):
+        raise NotImplementedError
+
     def __repr__(self):
         return "<%s %s>" % (self.__class__, self.name)
 
@@ -71,27 +74,26 @@ def __init__(self):
     def __unicode__(self):
         return "#document"
 
-    def printTree(self):
-        tree = unicode(self)
-        for child in self.childNodes:
-            tree += child.printTree(2)
-        return tree
-
     def toxml(self, encoding="utf=8"):
         result = ''
         for child in self.childNodes:
             result += child.toxml()
         return result.encode(encoding)
 
+    def printTree(self):
+        tree = unicode(self)
+        for child in self.childNodes:
+            tree += child.printTree(2)
+        return tree
+
 class DocumentType(Node):
     def __init__(self, name):
         Node.__init__(self, name)
 
     def __unicode__(self):
         return "<!DOCTYPE %s>" % self.name
 
-    def toxml(self):
-        return "";
+    toxml = __unicode__
 
 class TextNode(Node):
     def __init__(self, value):
@@ -112,16 +114,6 @@ def __init__(self, name):
     def __unicode__(self):
         return "<%s>" % self.name
 
-    def printTree(self, indent):
-        tree = '\n|%s%s' % (' '*indent, unicode(self))
-        indent += 2
-        if self.attributes:
-            for name, value in self.attributes.iteritems():
-                tree += '\n|%s%s="%s"' % (' ' * indent, name, value)
-        for child in self.childNodes:
-            tree += child.printTree(indent)
-        return tree
-
     def toxml(self):
         result = '<' + self.name
         if self.attributes:
@@ -136,15 +128,25 @@ def toxml(self):
             result += '/>'
         return result
 
+    def printTree(self, indent):
+        tree = '\n|%s%s' % (' '*indent, unicode(self))
+        indent += 2
+        if self.attributes:
+            for name, value in self.attributes.iteritems():
+                tree += '\n|%s%s="%s"' % (' ' * indent, name, value)
+        for child in self.childNodes:
+            tree += child.printTree(indent)
+        return tree
+
 class CommentNode(Node):
     def __init__(self, data):
         Node.__init__(self, None)
         self.data = data
 
     def __unicode__(self):
         return "<!-- %s -->" % self.data
-
-    toxml = __unicode__ 
+    
+    toxml = __unicode__
 
 class TreeBuilder(_base.TreeBuilder):
     documentClass = Document
