Added documentation, about to rename DOMlite to simpletree

jgraham · jgraham · commit 40b9e905d57a · 2007-01-02T22:25:20.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40402
diff --git a/src/parser.py b/src/parser.py
@@ -24,7 +24,7 @@
 
 import treebuilders
 from treebuilders.base import Marker
-from treebuilders import DOMlite
+from treebuilders import simpletree
 
 import utils
 from constants import contentModelFlags, spaceCharacters
@@ -34,7 +34,7 @@
 class HTMLParser(object):
     """Main parser class"""
 
-    def __init__(self, strict = False, tree=DOMlite.TreeBuilder):
+    def __init__(self, strict = False, tree=simpletree.TreeBuilder):
         # Raise an exception on the first error encountered
         self.strict = strict
         self.errors = []
@@ -907,7 +907,7 @@ def endTagFormatting(self, name):
             clone = afeElement.cloneNode()
 
             # Step 10
-            self.tree.reparentChildren(furthestBlock, clone)
+            furthestBlock.reparentChildren(clone)
 
             # Step 11
             furthestBlock.appendChild(clone)
diff --git a/src/treebuilders/DOMlite.py b/src/treebuilders/DOMlite.py
@@ -1,7 +1,7 @@
 import _base
 
 # Really crappy basic implementation of a DOM-core like thing
-class Node(object):
+class Node(_base.Node):
     def __init__(self, name):
         self.name = name
         self.parent = None
diff --git a/src/treebuilders/etree.py b/src/treebuilders/etree.py
@@ -5,7 +5,7 @@
 
 import _base
 
-class Element(object):
+class Element(_base.Node):
     def __init__(self, name):
         self._element = ElementTree.Element(name)
         self.name = name
@@ -18,9 +18,6 @@ def __init__(self, name):
         self._element.text = ""
         self._element.tail = ""
 
-    def __repr__(self):
-        return "<%s %s>" % (self.__class__, self.name)
-
     def _setName(self, name):
         self._element.tag = name
     
@@ -91,6 +88,14 @@ def cloneNode(self):
         element.attributes = self.attributes
         return element
 
+    def reparentChildren(self, newParent):
+        if newParent.childNodes:
+            newParent.childNodes[-1]._element.tail += self._element.text
+        else:
+            newParent._element.text += self._element.text
+        self._element.text = ""
+        _base.Node.reparentChildren(self, newParent)
+
 class Comment(Element):
     def __init__(self, data):
         Element.__init__(self, Comment)
@@ -157,11 +162,3 @@ def testSerializer(self, element):
 
     def getDocument(self):
         return self.document._element
-    
-    def reparentChildren(self, oldParent, newParent):
-        if newParent.childNodes:
-            newParent.childNodes[-1]._element.tail += oldParent._element.text
-        else:
-            newParent._element.text += oldParent._element.text
-        oldParent._element.text = ""
-        _base.TreeBuilder.reparentChildren(self, oldParent, newParent)
