Imports are Python3 compatible

CHANGES.rst

@@ -14,6 +14,9 @@ Bug fixes:
   In cases of a 404 page, the context is a browser view.
   [thet]
 
+- Imports are Python3 compatible 
+  [b4oshany]
+
 
 2.0rc8 (2017-09-05)
 -------------------

setup.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-from setuptools import setup, find_packages
+from setuptools import find_packages
+from setuptools import setup
+
 
 version = '2.0rc9.dev0'
 
@@ -39,13 +41,14 @@
     zip_safe=False,
     install_requires=[
         'setuptools',
+        'six',
         'plone.subrequest>=1.8',
         'plone.tiles>=1.8.3',
         'plone.app.blocks>=4.1.0',
         'plone.app.tiles>=3.0.3',
         'plone.app.drafts>=1.1.2',
         'plone.app.standardtiles>=2.2.0',
-        'Products.CMFPlone>=5.0.4'
+        'Products.CMFPlone>=5.0.4',
     ],
     extras_require={'test': [
         'plone.app.testing',

src/plone/app/mosaic/browser/editor.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from AccessControl import getSecurityManager
 from AccessControl import Unauthorized
-from ConfigParser import SafeConfigParser
 from plone import api
 from plone.app.blocks.interfaces import CONTENT_LAYOUT_MANIFEST_FORMAT
 from plone.app.blocks.interfaces import CONTENT_LAYOUT_RESOURCE_NAME
@@ -15,12 +14,14 @@
 from plone.registry.interfaces import IRegistry
 from plone.resource.manifest import MANIFEST_FILENAME
 from plone.resource.utils import queryResourceDirectory
+from six.moves.configparser import SafeConfigParser
 from zExceptions import NotFound
 from zope.component import getUtility
 from zope.publisher.browser import BrowserView
 
 import io
 import json
+import six
 
 
 def loadManifest(data):
@@ -244,7 +245,7 @@ def hide(self):
         hidden = registry['plone.app.mosaic.hidden_content_layouts']
         key = self.request.form.get('layout')
         if key and key not in hidden:
-            hidden.append(unicode(key))
+            hidden.append(six.text_type(key))
             registry['plone.app.mosaic.hidden_content_layouts'] = hidden
 
     def get_layout_id(self, layout):

src/plone/app/mosaic/browser/layoutmenu.py

@@ -15,7 +15,7 @@
 from plone.protect.utils import addTokenToUrl
 from Products.CMFDynamicViewFTI.interfaces import ISelectableBrowserDefault
 from Products.CMFPlone.utils import parent
-from urllib import quote
+from six.moves.urllib.parse import quote
 from zExceptions import NotFound
 from zope.browsermenu.interfaces import IBrowserMenu
 from zope.browsermenu.menu import BrowserMenu

src/plone/app/mosaic/browser/main_template.py

@@ -13,8 +13,8 @@
 from Products.Five import BrowserView
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from repoze.xmliter.utils import getHTMLSerializer
-from urlparse import unquote
-from urlparse import urljoin
+from six.moves.urllib.parse import unquote
+from six.moves.urllib.parse import urljoin
 from zExceptions import NotFound
 from zope.component import getMultiAdapter
 from zope.interface import alsoProvides
@@ -24,6 +24,7 @@
 import os
 import pkg_resources
 import re
+import six
 
 
 NSMAP = {'metal': 'http://namespaces.zope.org/metal'}
@@ -54,7 +55,7 @@
 
 
 def cook_layout_cachekey(func, layout, ajax):
-    if isinstance(layout, unicode):
+    if isinstance(layout, six.text_type):
         layout = layout.encode('utf-8', 'replace')
     return md5(layout).hexdigest(), ajax
 
@@ -138,7 +139,7 @@ def cook_layout(layout, ajax):
     layout = re.sub('\r', '\n', re.sub('\r\n', '\n', layout))
 
     # Parse layout
-    if isinstance(layout, unicode):
+    if isinstance(layout, six.text_type):
         result = getHTMLSerializer([layout.encode('utf-8')], encoding='utf-8')
     else:
         result = getHTMLSerializer([layout], encoding='utf-8')

src/plone/app/mosaic/setuphandlers.py

@@ -6,7 +6,7 @@
 from plone.app.mosaic.utils import getPersistentResourceDirectory
 from plone.resource.manifest import MANIFEST_FILENAME
 from Products.CMFPlone.interfaces import INonInstallable
-from StringIO import StringIO
+from six import StringIO
 from zope.component import getUtility
 from zope.interface import alsoProvides
 from zope.interface import implementer