innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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:
Marc Tamlyn 2014-01-12 20:32:26 +00:00
parent 0a7588dd3f
commit 89f12c0596
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/utils/html_parser.py
View File

@ -12,6 +12,17 @@ use_workaround = (
HTMLParseError = _html_parser.HTMLParseError HTMLParseError = _html_parser.HTMLParseError
if not use_workaround: if not use_workaround:
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 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|/(?!>))*')