Imports are Python3 compatible

CHANGES.rst

@@ -23,6 +23,8 @@ Bug fixes:
   fields on non-default fieldset
   [datakurre]
 
+- Imports are Python3 compatible
+  [b4oshany]
 
 2.2.0 (2017-06-09)
 ------------------

plone/app/standardtiles/existingcontent.py

@@ -21,6 +21,8 @@
 from zope.component.hooks import getSite
 from zope.interface import Invalid
 
+import six
+
 
 def uuidToObject(uuid):
     """Given a UUID, attempt to return a content object. Will return
@@ -174,7 +176,7 @@ def item_macros(self):
     def item_panels(self):
         default_view = self.default_view
         html = default_view()
-        if isinstance(html, unicode):
+        if isinstance(html, six.text_type):
             html = html.encode('utf-8')
         serializer = getHTMLSerializer([html], pretty_print=False,
                                        encoding='utf-8')

plone/app/standardtiles/portlets/edit.py

@@ -2,10 +2,9 @@
 from plone.app.tiles.browser.edit import DefaultEditView
 from plone.portlets.utils import unhashPortletInfo
 from plone.uuid.interfaces import IUUIDGenerator
+from six.moves import urllib
 from zope.component import getUtility
 
-import urllib
-
 
 class PortletTileEditView(DefaultEditView):
     """ Override the tile edit view for the portlet tile and redirect it to the
@@ -33,5 +32,5 @@ def __call__(self):
         )
         self.request.form['referer'] = tile_url
         self.request.response.redirect(
-            '{0}?referer={0}'.format(url, urllib.quote(tile_url))
+            '{0}?referer={0}'.format(url, urllib.parse.quote(tile_url))
         )

plone/app/standardtiles/tests/test_existing_content.py

@@ -17,8 +17,9 @@
 from unittest import TestCase
 from zope.component import createObject
 from zope.component import queryUtility
+
 import random
-import StringIO
+import six
 import transaction
 
 
@@ -31,7 +32,7 @@ def image():
                                              random.randint(0, 255)))
     del draw
 
-    output = StringIO.StringIO()
+    output = six.StringIO()
     img.save(output, 'PNG')
     output.seek(0)
 

plone/app/standardtiles/tests/test_media.py

@@ -14,15 +14,16 @@
 from plone.namedfile import NamedImage
 from plone.protect.authenticator import createToken
 from plone.testing.z2 import Browser
+from six.moves import urllib
+from six.moves.urllib.parse import quote
 from unittest import TestCase
-from urllib import quote
 from zope.annotation import IAnnotations
+
 import os
 import plone.app.standardtiles.tests as test_dir
 import random
-import StringIO
+import six
 import transaction
-import urllib
 
 
 def fromstring(s):
@@ -39,7 +40,7 @@ def image():
                                              random.randint(0, 255)))
     del draw
 
-    output = StringIO.StringIO()
+    output = six.StringIO()
     img.save(output, 'PNG')
     output.seek(0)
 
@@ -230,7 +231,7 @@ def test_rawhtml_tile(self):
         self.browser.open(
             self.pageURL +
             '/@@plone.app.standardtiles.rawhtml/test',
-            data='content={0:s}'.format(urllib.quote(content))
+            data='content={0:s}'.format(urllib.parse.quote(content))
         )
 
         root = fromstring(self.browser.contents)

setup.py

@@ -48,6 +48,7 @@
         'Products.CMFPlone>=5.0.4',
         'requests',
         'setuptools',
+        'six',
         'z3c.form',
     ],
     extras_require={