Backout last revision, I didn't mean to check it in

jgraham · jgraham · commit d05574a70b26 · 2009-09-26T22:45:19.000+02:00
diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
@@ -1262,18 +1262,16 @@ def startTagOther(self, token):
         self.tree.insertElement(token)
 
     def endTagP(self, token):
-
-        if not self.tree.elementInScope("p"):
-            self.startTagCloseP(impliedTagToken("p", "StartTag"))
+        if self.tree.elementInScope("p"):
+            self.tree.generateImpliedEndTags("p")
+        if self.tree.openElements[-1].name != "p":
             self.parser.parseError("unexpected-end-tag", {"name": "p"})
-            self.endTagP(impliedTagToken("p", "EndTag"))
+        if self.tree.elementInScope("p"):
+            while self.tree.elementInScope("p"):
+                self.tree.openElements.pop()
         else:
-            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()
+            self.startTagCloseP(impliedTagToken("p", "StartTag"))
+            self.endTagP(impliedTagToken("p"))
 
     def endTagBody(self, token):
         # XXX Need to take open <p> tags into account here. We shouldn't imply
