Implement Noah's Ark

James Graham · James Graham · commit 9ab28ebeeaab · 2010-11-09T17:24:34.000+01:00
diff --git a/html5lib/treebuilders/_base.py b/html5lib/treebuilders/_base.py
@@ -86,6 +86,29 @@ def hasContent(self):
         """
         raise NotImplementedError
 
+class ActiveFormattingElements(list):
+    def append(self, node):
+        equalCount = 0
+        if node != Marker:
+            for element in self[::-1]:
+                if element == Marker:
+                    break
+                if self.nodesEqual(element, node):
+                    equalCount += 1
+                if equalCount == 3:
+                    self.remove(element)
+                    break
+        list.append(self, node)
+
+    def nodesEqual(self, node1, node2):
+        if not node1.nameTuple == node2.nameTuple:
+            return False
+        
+        if not node1.attributes == node2.attributes:
+            return False
+        
+        return True
+
 class TreeBuilder(object):
     """Base treebuilder implementation
     documentClass - the class to use for the bottommost node of a document
@@ -118,7 +141,7 @@ def __init__(self, namespaceHTMLElements):
     
     def reset(self):
         self.openElements = []
-        self.activeFormattingElements = []
+        self.activeFormattingElements = ActiveFormattingElements()
 
         #XXX - rename these to headElement, formElement
         self.headPointer = None
diff --git a/html5lib/treebuilders/soup.py b/html5lib/treebuilders/soup.py
@@ -24,7 +24,15 @@ def __getitem__(self, name):
         return self.attrs[name]
     def __contains__(self, name):
         return name in self.attrs.keys()
-
+    def __eq__(self, other):
+        if len(self.keys()) != len(other.keys()):
+            return False
+        for item in self.keys():
+            if item not in other:
+                return False
+            if self[item] != other[item]:
+                return False
+        return True
 
 class Element(_base.Node):
     def __init__(self, element, soup, namespace):
