Merge

gsnedders · gsnedders · commit 64d50299afda · 2009-12-08T19:26:58.000+01:00
diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
     ]
 
 setup(name='html5lib',
-      version='0.11',
+      version='1.0',
       url='http://code.google.com/p/html5lib/',
       license="MIT License",
       description='HTML parser based on the WHAT-WG Web Applications 1.0' 
diff --git a/src/html5lib/__init__.py b/src/html5lib/__init__.py
@@ -11,6 +11,8 @@
 p = html5lib.HTMLParser()
 tree = p.parse(f) 
 """
+__version__ = "1.0"
 from html5parser import HTMLParser, parse, parseFragment
 from treebuilders import getTreeBuilder
+from treewalkers import getTreeWalker
 from serializer import serialize
diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
@@ -1292,7 +1292,7 @@ def endTagBlock(self, token):
     def endTagForm(self, token):
         node = self.tree.formPointer
         self.tree.formPointer = None
-        if node is None or not self.tree.elementInScope(token["name"]):
+        if node is None or not self.tree.elementInScope(node):
             self.parser.parseError("unexpected-end-tag",
                                    {"name":"form"})
         else:
@@ -1686,10 +1686,10 @@ def processComment(self, token):
         self.phase = self.originalPhase
         self.phase.processComment(token)
 
-    def processEOF(self, token):
+    def processEOF(self):
         self.flushCharacters()
         self.phase = self.originalPhase
-        self.phase.processEOF(token)
+        self.phase.processEOF()
 
     def processCharacters(self, token):
         self.characterTokens.append(token)
diff --git a/src/html5lib/treebuilders/_base.py b/src/html5lib/treebuilders/_base.py
@@ -157,19 +157,18 @@ def reconstructActiveFormattingElements(self):
             return
 
         # Step 2 and step 3: we start with the last element. So i is -1.
-        i = -1
+        i = len(self.activeFormattingElements) - 1
         entry = self.activeFormattingElements[i]
         if entry == Marker or entry in self.openElements:
             return
 
         # Step 6
         while entry != Marker and entry not in self.openElements:
-            i -= 1
-            if i < 0:
-                # Step 4: at this point we need to jump to step 8.
-                # So we reset the index to 0 and break
-                i += 1
+            if i == 0:
+                #This will be reset to 0 below
+                i = -1
                 break
+            i -= 1
             # Step 5: let entry be one earlier in the list.
             entry = self.activeFormattingElements[i]
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`]`
`25`	`25`
`26`	`26`	`setup(name='html5lib',`
`27`		`- version='0.11',`
	`27`	`+ version='1.0',`
`28`	`28`	`url='http://code.google.com/p/html5lib/',`
`29`	`29`	`license="MIT License",`
`30`	`30`	`description='HTML parser based on the WHAT-WG Web Applications 1.0'`