aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/py33compat.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-03-21 05:55:44 -0400
committerJason R. Coombs <jaraco@jaraco.com>2020-03-21 05:55:44 -0400
commitcfbefe5715e31db3c8cac70f7a1cd1c16fd4b5a7 (patch)
tree1551248b2a29b34b26388ea68fe994854f3e84e2 /setuptools/py33compat.py
parent7843688bc33dd4e13e10130bc49da4c290fe7d7f (diff)
parent060445bfb557a1d0f6b726716dafa6bacaa44c34 (diff)
downloadexternal_python_setuptools-cfbefe5715e31db3c8cac70f7a1cd1c16fd4b5a7.tar.gz
external_python_setuptools-cfbefe5715e31db3c8cac70f7a1cd1c16fd4b5a7.tar.bz2
external_python_setuptools-cfbefe5715e31db3c8cac70f7a1cd1c16fd4b5a7.zip
Merge branch 'master' into jorikdima-master
Diffstat (limited to 'setuptools/py33compat.py')
-rw-r--r--setuptools/py33compat.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/setuptools/py33compat.py b/setuptools/py33compat.py
index 87cf5398..cb694436 100644
--- 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