Merge pull request #1258 from MattBlack85/master

Use html.escape for python >= 3.4
Supervisor · Jul 18, 2019 · 02bb425 · 02bb425
2 parents 52f5ae8 + 48635d2
commit 02bb425
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,6 +35,11 @@ matrix:
             - TOXENV=py37
             - END_TO_END=1
           dist: xenial          # required for Python >= 3.7
+        - python: 3.8-dev
+          env:
+            - TOXENV=py38
+            - END_TO_END=1
+          dist: xenial          # required for Python >= 3.7
         - name: "Python: 3.7 on macOS"
           language: sh          # 'language: python' is not yet supported on Travis CI macOS
           os: osx

diff --git a/supervisor/medusa/util.py b/supervisor/medusa/util.py
@@ -1,4 +1,10 @@
-from cgi import escape
+from supervisor.compat import PY2
+
+if PY2:
+    from cgi import escape
+else:
+    from html import escape
+
 
 def html_repr (object):
     so = escape (repr (object))

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    cover,cover3,docs,py27,py34,py35,py36,py37
+    cover,cover3,docs,py27,py34,py35,py36,py37,py38
 
 [testenv]
 deps =