compatMode wasn't reinitialized between several uses of the same parser. Also changed compatMode values ("no-quirks" to "no quirks" and "limited-quirks" to "limited quirks")

tbroyer · tbroyer · commit 3da1fdcbc649 · 2008-03-13T17:18:44.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%401122
diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
@@ -54,7 +54,7 @@ def __init__(self, strict = False, tree=simpletree.TreeBuilder,
         self.errors = []
 
         # "quirks" / "limited-quirks" / "no-quirks"
-        self.compatMode = "no-quirks"
+        self.compatMode = "no quirks"
 
         self.phases = {
             "initial": InitialPhase(self, self.tree),
@@ -87,6 +87,7 @@ def _parse(self, stream, innerHTML=False, container="div",
         self.tree.reset()
         self.firstStartTag = False
         self.errors = []
+        self.compatMode = "no quirks"
 
         self.tokenizer = self.tokenizer_class(stream, encoding=encoding,
                                               parseMeta=parseMeta,
@@ -324,7 +325,7 @@ def processDoctype(self, name, publicId, systemId, correct):
         if publicId != "":
           publicId = publicId.translate(asciiUpper2Lower)
 
-        if not correct or nameLower != "html"\
+        if (not correct) or nameLower != "html"\
             or publicId in\
               ("+//silmaril//dtd html pro v0r11 19970101//en",
                "-//advasoft ltd//dtd html 3.0 aswedit + extensions//en",
@@ -399,15 +400,15 @@ def processDoctype(self, name, publicId, systemId, correct):
               ("-//w3c//dtd html 4.01 frameset//EN",
                "-//w3c//dtd html 4.01 transitional//EN") and systemId == None)\
             or (systemId != None and\
-                systemId == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd"):
+              systemId == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd"):
                 self.compatMode = "quirks"
         elif publicId in\
               ("-//w3c//dtd xhtml 1.0 frameset//EN",
                "-//w3c//dtd xhtml 1.0 transitional//EN")\
             or (publicId in\
               ("-//w3c//dtd html 4.01 frameset//EN",
                "-//w3c//dtd html 4.01 transitional//EN") and systemId == None):
-               self.compatMode = "limited-quirks"
+               self.compatMode = "limited quirks"
 
         self.parser.phase = self.parser.phases["beforeHtml"]
 
