Add EOF abrupted comment tag case handling and tests

Author: Privat33r-dev

Lib/_markupbase.py

@@ -161,13 +161,19 @@ def parse_marked_section(self, i, report=1):
             self.unknown_decl(rawdata[i+3: j])
         return match.end(0)
 
-    # Internal -- parse comment, return length or -1 if not terminated
-    def parse_comment(self, i, report=1):
+    # Internal -- parse comment
+    # if end is True, returns EOF location if no close tag is found, otherwise
+    # return length or -1 if not terminated
+    def parse_comment(self, i, report=1, end=False):
         rawdata = self.rawdata
         if rawdata[i:i+4] != '<!--':
             raise AssertionError('unexpected call to parse_comment()')
         match = _commentclose.search(rawdata, i+2)
         if not match:
+            if end:
+                if report:
+                    self.handle_comment(rawdata[i+4:])
+                return len(rawdata)
             return -1
         if report:
             j = match.start(0)

Lib/html/parser.py

@@ -172,7 +172,7 @@ def goahead(self, end):
                 elif startswith("</", i):
                     k = self.parse_endtag(i)
                 elif startswith("<!--", i):
-                    k = self.parse_comment(i)
+                    k = self.parse_comment(i, end=end)
                 elif startswith("<?", i):
                     k = self.parse_pi(i)
                 elif startswith("<!", i):

Lib/test/test_htmlparser.py

@@ -333,7 +333,8 @@ def test_comments(self):
                 '<!---!>'
                 '<!--I have invalid attempt to close (space) -- >-->'
                 '<!--Me too (invalid character) --x>-->'
-                '<!--Me too (invalid characters) --cheese>-->')
+                '<!--Me too (invalid characters) --cheese>-->'
+                '<!--EOF comment')
         expected = [('comment', " I'm a valid comment "),
                     ('comment', 'me too!'),
                     ('comment', '--'),
@@ -349,8 +350,8 @@ def test_comments(self):
                     ('comment', ''),
                     ('comment', 'I have invalid attempt to close (space) -- >'),
                     ('comment', 'Me too (invalid character) --x>'),
-                    ('comment', 'Me too (invalid characters) --cheese>')
-                    ]
+                    ('comment', 'Me too (invalid characters) --cheese>'),
+                    ('comment', 'EOF comment')]
         self._run_check(html, expected)
 
     def test_condcoms(self):