Merge pull request #2198 from plone/py3-class-type

Fix vanished ClassType import
plone · Nov 1, 2017 · b45d361 · b45d361
2 parents 561bc78 + 8b34bce
commit b45d361
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -28,6 +28,9 @@ New Features:
 
 Bug Fixes:
 
+- Increase compatibility with Python3.
+  [ale-rt]
+
 - Show example for expression in actions control panel.
   [maurits]
 

diff --git a/Products/CMFPlone/utils.py b/Products/CMFPlone/utils.py
@@ -30,7 +30,6 @@
 from Products.CMFPlone.log import log
 from Products.CMFPlone.log import log_deprecated
 from Products.CMFPlone.log import log_exc
-from types import ClassType
 from urlparse import urlparse
 from webdav.interfaces import IWriteLock
 from zope import schema
@@ -57,6 +56,12 @@
 import zope.interface
 
 
+try:
+    from types import ClassType
+except ImportError:
+    ClassType = type
+
+
 deprecated_import(
     "Import from Products.CMFPlone.defaultpage instead",
     isDefaultPage='Products.CMFPlone.defaultpage:check_default_page_via_view',