Add more edge cases and tests

Author: Privat33r-dev

Lib/_markupbase.py

@@ -81,7 +81,7 @@ def parse_declaration(self, i):
         # A simple, practical version could look like: ((name|stringlit) S*) + '>'
         n = len(rawdata)
         if rawdata[j:j+2] == '--': #comment
-            # Locate --.*-- as the body of the comment
+            # Locate the body of the comment.
             return self.parse_comment(i)
         elif rawdata[j] == '[': #marked section
             # Locate [statusWord [...arbitrary SGML...]] as the body of the marked section
@@ -166,7 +166,7 @@ def parse_comment(self, i, report=1):
         rawdata = self.rawdata
         if rawdata[i:i+4] != '<!--':
             raise AssertionError('unexpected call to parse_comment()')
-        match = _commentclose.search(rawdata, i+4)
+        match = _commentclose.search(rawdata, i+2)
         if not match:
             return -1
         if report:

Lib/test/test_htmlparser.py

@@ -324,14 +324,22 @@ def test_comments(self):
                 '<!---->'
                 '<!----I have many hyphens---->'
                 '<!-- I have a > in the middle -->'
-                '<!-- and I have -- in the middle! -->')
+                '<!-- and I have -- in the middle! -->'
+                '<!--->'
+                '<!-->'
+                '<!--<!--->'
+                '<!--incorrectly-closed-comment--!>')
         expected = [('comment', " I'm a valid comment "),
                     ('comment', 'me too!'),
                     ('comment', '--'),
                     ('comment', ''),
                     ('comment', '--I have many hyphens--'),
                     ('comment', ' I have a > in the middle '),
-                    ('comment', ' and I have -- in the middle! ')]
+                    ('comment', ' and I have -- in the middle! '),
+                    ('comment', ''),
+                    ('comment', ''),
+                    ('comment', '<!-'),
+                    ('comment', 'incorrectly-closed-comment')]
         self._run_check(html, expected)
 
     def test_condcoms(self):