Prepare for more Python 2 / 3 compatibility

plone · Jan 28, 2018 · 1c562a8 · 1c562a8 · jenkins-plone-org · Jan 28, 2018
1 parent f50db20
commit 1c562a8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,8 +14,8 @@ New features:
 
 Bug fixes:
 
-- Imports are Python3 compatible
-  [ale-rt]
+- Prepare for Python 2 / 3 compatibility
+  [ale-rt, pbauer]
 
 - remove mention of "retina" (https://github.com/plone/Products.CMFPlone/issues/2123)
   [tkimnguyen]

diff --git a/plone/namedfile/file.py b/plone/namedfile/file.py
@@ -19,9 +19,9 @@
 from zope.schema.fieldproperty import FieldProperty
 
 import piexif
+import six
 import transaction
 
-
 log = getLogger(__name__)
 
 
@@ -179,7 +179,7 @@ def _getData(self):
     def _setData(self, data):
 
         # Handle case when data is a string
-        if isinstance(data, unicode):
+        if isinstance(data, six.text_type):
             data = data.encode('UTF-8')
 
         if isinstance(data, str):

diff --git a/plone/namedfile/scaling.py b/plone/namedfile/scaling.py
@@ -29,7 +29,7 @@
 from zope.traversing.interfaces import TraversalError
 
 import logging
-
+import six
 
 logger = logging.getLogger(__name__)
 _marker = object()
@@ -114,7 +114,7 @@ def tag(self, height=_marker, width=_marker, alt=_marker,
             if isinstance(v, int):
                 v = str(v)
             elif isinstance(v, str):
-                v = unicode(v, 'utf8')
+                v = six.text_type(v, 'utf8')
             parts.append(u'{0}={1}'.format(k, quoteattr(v)))
         parts.append('/>')
 

diff --git a/plone/namedfile/storages.py b/plone/namedfile/storages.py
@@ -8,6 +8,7 @@
 from zope.interface import implementer
 from zope.publisher.browser import FileUpload
 
+import six
 
 MAXCHUNKSIZE = 1 << 16
 
@@ -27,7 +28,7 @@ def store(self, data, blob):
 class UnicodeStorable(StringStorable):
 
     def store(self, data, blob):
-        if not isinstance(data, unicode):
+        if not isinstance(data, six.text_type):
             raise NotStorable('Could not store data (not of "unicode" type).')
 
         data = data.encode('UTF-8')

diff --git a/plone/namedfile/utils/__init__.py b/plone/namedfile/utils/__init__.py
@@ -6,16 +6,16 @@
 from plone.namedfile.utils.tiff_utils import process_tiff
 from plone.registry.interfaces import IRegistry
 from six import StringIO
+from six.moves import urllib
 from zope.component import queryUtility
 from zope.deprecation import deprecate
 
 import mimetypes
 import os.path
 import piexif
 import PIL.Image
+import six
 import struct
-import urllib
-
 
 log = getLogger(__name__)
 
@@ -75,9 +75,9 @@ def set_headers(file, response, filename=None):
     response.setHeader('Content-Length', file.getSize())
 
     if filename is not None:
-        if not isinstance(filename, unicode):
-            filename = unicode(filename, 'utf-8', errors='ignore')
-        filename = urllib.quote(filename.encode('utf8'))
+        if not isinstance(filename, six.text_type):
+            filename = six.text_type(filename, 'utf-8', errors='ignore')
+        filename = urllib.parse.quote(filename.encode('utf8'))
         response.setHeader(
             'Content-Disposition',
             'attachment; filename*=UTF-8\'\'{0}'.format(filename)