bleeding edge entity handling

annevk · annevk · commit 308d3a263c2f · 2007-06-28T17:43:01.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40835
diff --git a/src/html5lib/tokenizer.py b/src/html5lib/tokenizer.py
@@ -292,12 +292,12 @@ def dataState(self):
                 self.lastFourChars.pop(0)
             self.lastFourChars.append(data)
         if data == "&" and self.contentModelFlag in\
-          (contentModelFlags["PCDATA"], contentModelFlags["RCDATA"]):
+          (contentModelFlags["PCDATA"], contentModelFlags["RCDATA"]) and not\
+          self.escapeFlag:
             self.state = self.states["entityData"]
         elif data == "-" and self.contentModelFlag in\
-          (contentModelFlags["CDATA"], contentModelFlags["RCDATA"]) and\
-          self.escapeFlag == False and\
-          "".join(self.lastFourChars) == "<!--":
+          (contentModelFlags["CDATA"], contentModelFlags["RCDATA"]) and not\
+          self.escapeFlag and "".join(self.lastFourChars) == "<!--":
             self.escapeFlag = True
             self.tokenQueue.append({"type": "Characters", "data":data})
         elif data == "<" and (self.contentModelFlag ==\
@@ -307,7 +307,7 @@ def dataState(self):
             self.state = self.states["tagOpen"]
         elif data == ">" and self.contentModelFlag in\
           (contentModelFlags["CDATA"], contentModelFlags["RCDATA"]) and\
-          self.escapeFlag == True and "".join(self.lastFourChars)[1:] == "-->":
+          self.escapeFlag and "".join(self.lastFourChars)[1:] == "-->":
             self.escapeFlag = False
             self.tokenQueue.append({"type": "Characters", "data":data})
         elif data == EOF:
