Merge pull request #1788 from methane/patch-1

stop using deprecated HTMLParser.unescape

Merge pull request #1788 from methane/patch-1
stop using deprecated HTMLParser.unescape
62bd4832 · mergify[bot] · GitHub · 8aeff6b2 · 53b8db35 · 62bd4832
Commit 62bd4832 authored Jun 19, 2019 by mergify[bot] Committed by GitHub Jun 19, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

changelog.d/1788.change.rst changelog.d/1788.change.rst +1 -0

setuptools/py33compat.py setuptools/py33compat.py +5 -1

No files found.
--- a/changelog.d/1788.change.rst
+++ b/changelog.d/1788.change.rst
+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.
--- a/setuptools/py33compat.py
+++ b/setuptools/py33compat.py
@@ -52,4 +52,8 @@ class Bytecode_compat:
 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