some elements didn't check if <p> was in scope before invoking endTagP and change some small bits

annevk · annevk · commit bd0af345ab25 · 2006-12-23T10:41:17.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40274
diff --git a/src/parser.py b/src/parser.py
@@ -863,11 +863,11 @@ def startTagBody(self, name, attributes):
 
     def startTagCloseP(self, name, attributes):
         if self.parser.elementInScope("p"):
-            self.endTagP(name)
+            self.endTagP("p")
         self.parser.insertElement(name, attributes)
 
     def startTagForm(self, name, attributes):
-        if self.parser.formPointer is not None:
+        if self.parser.formPointer:
             self.parser.parseError()
         else:
             if self.parser.elementInScope("p"):
@@ -961,7 +961,8 @@ def startTagVoidFormatting(self, name, attributes):
         self.parser.openElements.pop()
 
     def startTagHr(self, name, attributes):
-        self.endTagP("p")
+        if self.parser.elementInScope("p"):
+            self.endTagP("p")
         self.parser.insertElement(name, attributes)
         self.parser.openElements.pop()
 
@@ -973,14 +974,14 @@ def startTagImage(self, name, attributes):
     def startTagInput(self, name, attributes):
         self.parser.reconstructActiveFormattingElements()
         self.parser.insertElement(name, attributes)
-        if self.parser.formPointer is not None:
+        if self.parser.formPointer:
             # XXX Not exactly sure what to do here
             self.parser.openElements[-1].form = self.parser.formPointer
         self.parser.openElements.pop()
 
     def startTagIsIndex(self, name, attributes):
         self.parser.parseError()
-        if self.parser.formPointer is not None:
+        if self.parser.formPointer:
             return
         self.parser.processStartTag("form", [])
         self.parser.processStartTag("hr", [])
@@ -1060,7 +1061,7 @@ def processEndTag(self, name):
     def endTagP(self, name):
         self.parser.generateImpliedEndTags("p")
         if self.parser.openElements[-1].name != "p":
-           self.parser.parseError()
+            self.parser.parseError()
         while self.parser.elementInScope("p"):
             self.parser.openElements.pop()
 
