remove a parse error and useless check in the close tag open state per spec change and update test to match that

annevk · annevk · commit f66a87903174 · 2007-06-19T10:21:03.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40756
diff --git a/src/tokenizer.py b/src/tokenizer.py
@@ -379,36 +379,32 @@ def closeTagOpenState(self):
                 # emitting the end tag token.
                 self.contentModelFlag = contentModelFlags["PCDATA"]
             else:
-                self.tokenQueue.append({"type": "ParseError", "data":
-                  _("Expected closing tag after seeing '</'. None found.")})
                 self.tokenQueue.append({"type": "Characters", "data": u"</"})
                 self.state = self.states["data"]
 
                 # Need to return here since we don't want the rest of the
                 # method to be walked through.
                 return True
 
-        if self.contentModelFlag == contentModelFlags["PCDATA"]:
-            data = self.stream.char()
-            if data in asciiLetters:
-                self.currentToken =\
-                  {"type": "EndTag", "name": data, "data": []}
-                self.state = self.states["tagName"]
-            elif data == u">":
-                self.tokenQueue.append({"type": "ParseError", "data":
-                  _("Expected closing tag. Got '>' instead. Ignoring '</>'.")})
-                self.state = self.states["data"]
-            elif data == EOF:
-                self.tokenQueue.append({"type": "ParseError", "data":
-                  _("Expected closing tag. Unexpected end of file.")})
-                self.tokenQueue.append({"type": "Characters", "data": u"</"})
-                self.state = self.states["data"]
-            else:
-                # XXX data can be _'_...
-                self.tokenQueue.append({"type": "ParseError", "data":
-                  _("Expected closing tag. Unexpected character '" + data + "' found.")})
-                self.stream.queue.append(data)
-                self.state = self.states["bogusComment"]
+        data = self.stream.char()
+        if data in asciiLetters:
+            self.currentToken = {"type":"EndTag", "name":data, "data":[]}
+            self.state = self.states["tagName"]
+        elif data == u">":
+            self.tokenQueue.append({"type": "ParseError", "data":
+              _("Expected closing tag. Got '>' instead. Ignoring '</>'.")})
+            self.state = self.states["data"]
+        elif data == EOF:
+            self.tokenQueue.append({"type": "ParseError", "data":
+              _("Expected closing tag. Unexpected end of file.")})
+            self.tokenQueue.append({"type": "Characters", "data": u"</"})
+            self.state = self.states["data"]
+        else:
+            # XXX data can be _'_...
+            self.tokenQueue.append({"type": "ParseError", "data":
+              _("Expected closing tag. Unexpected character '" + data + "' found.")})
+            self.stream.queue.append(data)
+            self.state = self.states["bogusComment"]
         return True
 
     def tagNameState(self):
diff --git a/tests/mockParser.py b/tests/mockParser.py
@@ -1,4 +1,5 @@
-import sys, hotshot, hotshot.stats
+import sys
+#import hotshot, hotshot.stats
 import os
 
 if __name__ == '__main__':
