Fix </p> handling

jgraham · jgraham · commit 4751ac4d8215 · 2009-10-15T21:28:17.000+02:00
diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
@@ -953,7 +953,7 @@ def processCharacters(self, token):
         # do it for space characters.
         self.tree.reconstructActiveFormattingElements()
         self.tree.insertText(token["data"])
-        self.framesetOK = False
+        self.parser.framesetOK = False
 
     #This matches the current spec but may not match the real world
     def processSpaceCharacters(self, token):
@@ -1262,16 +1262,17 @@ def startTagOther(self, token):
         self.tree.insertElement(token)
 
     def endTagP(self, token):
-        if self.tree.elementInScope("p"):
-            self.tree.generateImpliedEndTags("p")
-        if self.tree.openElements[-1].name != "p":
+        if not self.tree.elementInScope("p"):
+            self.startTagCloseP(impliedTagToken("p", "StartTag"))
             self.parser.parseError("unexpected-end-tag", {"name": "p"})
-        if self.tree.elementInScope("p"):
-            while self.tree.elementInScope("p"):
-                self.tree.openElements.pop()
+            self.endTagP(impliedTagToken("p", "EndTag"))
         else:
-            self.startTagCloseP(impliedTagToken("p", "StartTag"))
-            self.endTagP(impliedTagToken("p"))
+            self.tree.generateImpliedEndTags("p")
+            if self.tree.openElements[-1].name != "p":
+                self.parser.parseError("unexpected-end-tag", {"name": "p"})
+            node = self.tree.openElements.pop()
+            while node.name != "p":
+                node = self.tree.openElements.pop()
 
     def endTagBody(self, token):
         # XXX Need to take open <p> tags into account here. We shouldn't imply
