Merge pull request #200 from plone/python38

Add support for Python 3.8
plone · Jun 22, 2019 · 003f002 · 003f002
2 parents 40f0e85 + d288614
commit 003f002
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/news/200.feature b/news/200.feature
@@ -0,0 +1 @@
+Add support for Python 3.8 [pbauer]
diff --git a/plone/app/layout/viewlets/common.py b/plone/app/layout/viewlets/common.py
@@ -2,7 +2,6 @@
 from AccessControl import getSecurityManager
 from Acquisition import aq_base
 from Acquisition import aq_inner
-from cgi import escape
 from collections import defaultdict
 from datetime import date
 from functools import total_ordering
@@ -33,6 +32,11 @@
 from zope.interface import implementer
 from zope.viewlet.interfaces import IViewlet
 
+try:
+    from html import escape
+except ImportError:
+    from cgi import escape
+
 
 @implementer(IViewlet)
 @total_ordering

diff --git a/setup.py b/setup.py
@@ -24,6 +24,7 @@
           "Programming Language :: Python :: 2.7",
           "Programming Language :: Python :: 3.6",
           "Programming Language :: Python :: 3.7",
+          "Programming Language :: Python :: 3.8",
       ],
       keywords='plone layout viewlet',
       author='Plone Foundation',