diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-11-07 16:31:36 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-11-07 16:31:36 (GMT) |
| commit | b8147452265077d4c12464a9943903f0d040f79c (patch) | |
| tree | fa6d0969cabf2cb14c99e7f049978d3b9f675527 | |
| parent | a691219716ea8f2089fb35c573a1f055872d4da2 (diff) | |
| download | cpython-b8147452265077d4c12464a9943903f0d040f79c.zip cpython-b8147452265077d4c12464a9943903f0d040f79c.tar.gz cpython-b8147452265077d4c12464a9943903f0d040f79c.tar.bz2 | |
#19480: HTMLParser now accepts all valid start-tag names as defined by the HTML5 standard.
| -rw-r--r-- | Lib/HTMLParser.py | 11 | ||||
| -rw-r--r-- | Lib/test/test_htmlparser.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS | 5 |
3 files changed, 17 insertions, 7 deletions
diff --git a/Lib/HTMLParser.py b/Lib/HTMLParser.py index b336a4c..5a55e26 100644 --- a/Lib/HTMLParser.py +++ b/Lib/HTMLParser.py @@ -22,9 +22,12 @@ charref = re.compile('&#(?:[0-9]+|[xX][0-9a-fA-F]+)[^0-9a-fA-F]') starttagopen = re.compile('<[a-zA-Z]') piclose = re.compile('>') commentclose = re.compile(r'--\s*>') -tagfind = re.compile('([a-zA-Z][-.a-zA-Z0-9:_]*)(?:\s|/(?!>))*') + # see http://www.w3.org/TR/html5/tokenization.html#tag-open-state # and http://www.w3.org/TR/html5/tokenization.html#tag-name-state +# note: if you change tagfind/attrfind remember to update locatestarttagend too +tagfind = re.compile('([a-zA-Z][^\t\n\r\f />\x00]*)(?:\s|/(?!>))*') +# this regex is currently unused, but left for backward compatibility tagfind_tolerant = re.compile('[a-zA-Z][^\t\n\r\f />\x00]*') attrfind = re.compile( @@ -32,7 +35,7 @@ attrfind = re.compile( r'(\'[^\']*\'|"[^"]*"|(?![\'"])[^>\s]*))?(?:\s|/(?!>))*') locatestarttagend = re.compile(r""" - <[a-zA-Z][-.a-zA-Z0-9:_]* # tag name + <[a-zA-Z][^\t\n\r\f />\x00]* # tag name (?:[\s/]* # optional whitespace before attribute name (?:(?<=['"\s/])[^\s/>][^\s/=>]* # attribute name (?:\s*=+\s* # value indicator @@ -373,14 +376,14 @@ class HTMLParser(markupbase.ParserBase): self.handle_data(rawdata[i:gtpos]) return gtpos # find the name: w3.org/TR/html5/tokenization.html#tag-name-state - namematch = tagfind_tolerant.match(rawdata, i+2) + namematch = tagfind.match(rawdata, i+2) if not namematch: # w3.org/TR/html5/tokenization.html#end-tag-open-state if rawdata[i:i+3] == '</>': return i+3 else: return self.parse_bogus_comment(i) - tagname = namematch.group().lower() + tagname = namematch.group(1).lower() # consume and ignore other stuff between the name and the > # Note: this is not 100% correct, since we might have things like # </tag attr=">">, but looking for > after tha name should cover diff --git a/Lib/test/test_htmlparser.py b/Lib/test/test_htmlparser.py index 8cc461f..6a0e461 100644 --- a/Lib/test/test_htmlparser.py +++ b/Lib/test/test_htmlparser.py @@ -206,8 +206,7 @@ text self._run_check("</$>", [('comment', '$')]) self._run_check("</", [('data', '</')]) self._run_check("</a", [('data', '</a')]) - # XXX this might be wrong - self._run_check("<a<a>", [('data', '<a'), ('starttag', 'a', [])]) + self._run_check("<a<a>", [('starttag', 'a<a', [])]) self._run_check("</a<a>", [('endtag', 'a<a')]) self._run_check("<!", [('data', '<!')]) self._run_check("<a", [('data', '<a')]) @@ -215,6 +214,11 @@ text self._run_check("<a foo='bar", [('data', "<a foo='bar")]) self._run_check("<a foo='>'", [('data', "<a foo='>'")]) self._run_check("<a foo='>", [('data', "<a foo='>")]) + self._run_check("<a$>", [('starttag', 'a$', [])]) + self._run_check("<a$b>", [('starttag', 'a$b', [])]) + self._run_check("<a$b/>", [('startendtag', 'a$b', [])]) + self._run_check("<a$b >", [('starttag', 'a$b', [])]) + self._run_check("<a$b />", [('startendtag', 'a$b', [])]) def test_valid_doctypes(self): # from http://www.w3.org/QA/2002/04/valid-dtd-list.html @@ -12,8 +12,11 @@ Core and Builtins Library ------- +- Issue #19480: HTMLParser now accepts all valid start-tag names as defined + by the HTML5 standard. + - Issue #17827: Add the missing documentation for ``codecs.encode`` and - ``codecs.decode``. + ``codecs.decode``. - Issue #6157: Fixed Tkinter.Text.debug(). Original patch by Guilherme Polo. |