Stop using deprecated HTMLParser.unescape

HTMLParser.unescape is accessed even when unused - this will cause an exception when `HTMLParser.unescape` is removed in Python 3.9.
pypa · Jun 19, 2019 · 53b8db3 · 53b8db3
1 parent 8aeff6b
commit 53b8db3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/changelog.d/1788.change.rst b/changelog.d/1788.change.rst
@@ -0,0 +1 @@
+Changed compatibility fallback logic for ``html.unescape`` to avoid accessing ``HTMLParser.unescape`` when not necessary. ``HTMLParser.unescape`` is deprecated and will be removed in Python 3.9.
diff --git a/setuptools/py33compat.py b/setuptools/py33compat.py
@@ -52,4 +52,8 @@ def __iter__(self):
 Bytecode = getattr(dis, 'Bytecode', Bytecode_compat)
 
 
-unescape = getattr(html, 'unescape', html_parser.HTMLParser().unescape)
+unescape = getattr(html, 'unescape', None)
+if unescape is None:
+    # HTMLParser.unescape is deprecated since Python 3.4, and will be removed
+    # from 3.9.
+    unescape = html_parser.HTMLParser().unescape