mirror of https://github.com/django/django.git
Add further workarounds for HTMLParser with Python 3.4.
Python 3.5 will change the default value of convert_charrefs, so 3.4 gives warnings if it's not present. This is slightly technical as 2.7 doesn't have the kwarg. Thankfully, we already have a bunch of workarounds for different versions.
This commit is contained in:
parent
0a7588dd3f
commit
89f12c0596
|
@ -12,7 +12,18 @@ use_workaround = (
|
||||||
HTMLParseError = _html_parser.HTMLParseError
|
HTMLParseError = _html_parser.HTMLParseError
|
||||||
|
|
||||||
if not use_workaround:
|
if not use_workaround:
|
||||||
HTMLParser = _html_parser.HTMLParser
|
if current_version >= (3, 4):
|
||||||
|
class HTMLParser(_html_parser.HTMLParser):
|
||||||
|
"""Explicitly set convert_charrefs to be False.
|
||||||
|
|
||||||
|
This silences a deprecation warning on Python 3.4, but we can't do
|
||||||
|
it at call time because Python 2.7 does not have the keyword
|
||||||
|
argument.
|
||||||
|
"""
|
||||||
|
def __init__(self, convert_charrefs=False):
|
||||||
|
_html_parser.HTMLParser.__init__(self, convert_charrefs=convert_charrefs)
|
||||||
|
else:
|
||||||
|
HTMLParser = _html_parser.HTMLParser
|
||||||
else:
|
else:
|
||||||
tagfind = re.compile('([a-zA-Z][-.a-zA-Z0-9:_]*)(?:\s|/(?!>))*')
|
tagfind = re.compile('([a-zA-Z][-.a-zA-Z0-9:_]*)(?:\s|/(?!>))*')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue