mirror of https://github.com/python/cpython.git
#14538: HTMLParser can now parse correctly start tags that contain a bare /.
This commit is contained in:
parent
a72aa843b6
commit
c45868ec69
|
@ -22,13 +22,13 @@
|
|||
starttagopen = re.compile('<[a-zA-Z]')
|
||||
piclose = re.compile('>')
|
||||
commentclose = re.compile(r'--\s*>')
|
||||
tagfind = re.compile('[a-zA-Z][-.a-zA-Z0-9:_]*')
|
||||
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
|
||||
tagfind_tolerant = re.compile('[a-zA-Z][^\t\n\r\f />\x00]*')
|
||||
|
||||
attrfind = re.compile(
|
||||
r'[\s/]*((?<=[\'"\s/])[^\s/>][^\s/=>]*)(\s*=+\s*'
|
||||
r'((?<=[\'"\s/])[^\s/>][^\s/=>]*)(\s*=+\s*'
|
||||
r'(\'[^\']*\'|"[^"]*"|(?![\'"])[^>\s]*))?(?:\s|/(?!>))*')
|
||||
|
||||
locatestarttagend = re.compile(r"""
|
||||
|
@ -289,7 +289,7 @@ def parse_starttag(self, i):
|
|||
match = tagfind.match(rawdata, i+1)
|
||||
assert match, 'unexpected call to parse_starttag()'
|
||||
k = match.end()
|
||||
self.lasttag = tag = rawdata[i+1:k].lower()
|
||||
self.lasttag = tag = match.group(1).lower()
|
||||
|
||||
while k < endpos:
|
||||
m = attrfind.match(rawdata, k)
|
||||
|
|
|
@ -260,6 +260,16 @@ def test_slashes_in_starttag(self):
|
|||
('starttag', 'a', [('foo', None), ('=', None), ('bar', None)])
|
||||
]
|
||||
self._run_check(html, expected)
|
||||
#see issue #14538
|
||||
html = ('<meta><meta / ><meta // ><meta / / >'
|
||||
'<meta/><meta /><meta //><meta//>')
|
||||
expected = [
|
||||
('starttag', 'meta', []), ('starttag', 'meta', []),
|
||||
('starttag', 'meta', []), ('starttag', 'meta', []),
|
||||
('startendtag', 'meta', []), ('startendtag', 'meta', []),
|
||||
('startendtag', 'meta', []), ('startendtag', 'meta', []),
|
||||
]
|
||||
self._run_check(html, expected)
|
||||
|
||||
def test_declaration_junk_chars(self):
|
||||
self._run_check("<!DOCTYPE foo $ >", [('decl', 'DOCTYPE foo $ ')])
|
||||
|
|
|
@ -50,6 +50,9 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #14538: HTMLParser can now parse correctly start tags that contain
|
||||
a bare '/'.
|
||||
|
||||
- Issue #14452: SysLogHandler no longer inserts a UTF-8 BOM into the message.
|
||||
|
||||
- Issue #13496: Fix potential overflow in bisect.bisect algorithm when applied
|
||||
|
|
Loading…
Reference in New Issue