fix in frameset a bit more and change parseError()

annevk · annevk · commit ecf2ab0c6814 · 2006-12-30T21:08:56.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40386
diff --git a/src/parser.py b/src/parser.py
@@ -97,7 +97,8 @@ def parse(self, stream, innerHTML=False):
 
         return self.tree.getDocument()
 
-    def parseError(self, data=None):
+    def parseError(self, data="XXX ERROR MESSAGE NEEDED"):
+        # The idea is to make data mandatory.
         self.errors.append(data)
         if self.strict:
             raise ParseError
@@ -1544,7 +1545,8 @@ def __init__(self, parser, tree):
         self.startTagHandler.default = self.startTagOther
 
         self.endTagHandler = utils.MethodDispatcher([
-            ("frameset", self.endTagFrameset)
+            ("frameset", self.endTagFrameset),
+            ("noframes", self.endTagNoframes)
         ])
         self.endTagHandler.default = self.endTagOther
 
@@ -1579,6 +1581,10 @@ def endTagFrameset(self, name):
             # "frameset" element (anymore) then switch.
             self.parser.phase = self.parser.phases["afterFrameset"]
 
+    def endTagNoframes(self, name):
+        # XXX likely to be an innerHTML case here too
+        self.tree.openElements.pop()
+
     def endTagOther(self, name):
         self.parser.parseError("Unexpected end tag token (" + name +
           ") in the frameset phase.")
diff --git a/tests/test_parser.py b/tests/test_parser.py
@@ -55,8 +55,8 @@ def runParserTest(self, input, output, errors):
           convertTreeDump(document.printTree())])
         self.assertEquals(output, convertTreeDump(document.printTree()),
           errorMsg)
-        errorMsg2 = "\n".join(["\n\nInput errors:  " + str(len(errors)),
-          "Actual errors: " + str(len(p.errors))])
+        errorMsg2 = "\n".join(["\n\nInput errors:\n" + "\n".join(errors),
+          "Actual errors:\n" + "\n".join(p.errors)])
         self.assertEquals(len(p.errors), len(errors), errorMsg2)
 
 def test_parser():
