Imports are Python3 compatible

plone · Oct 23, 2017 · ed0c45c · ed0c45c · jenkins-plone-org · Oct 23, 2017
1 parent 6f1d946
commit ed0c45c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,6 +14,9 @@ New features:
 
 Bug fixes:
 
+- Imports are Python3 compatible
+  [ale-rt]
+
 - remove mention of "retina" (https://github.com/plone/Products.CMFPlone/issues/2123)
   [tkimnguyen]
 

diff --git a/plone/namedfile/tests/test_scaling.py b/plone/namedfile/tests/test_scaling.py
@@ -10,7 +10,7 @@
 from plone.namedfile.testing import PLONE_NAMEDFILE_INTEGRATION_TESTING
 from plone.namedfile.tests import getFile
 from plone.scale.interfaces import IScaledImageQuality
-from StringIO import StringIO
+from six.StringIO import StringIO
 from zExceptions import Unauthorized
 from zope.annotation import IAttributeAnnotatable
 from zope.component import getGlobalSiteManager

diff --git a/plone/namedfile/tests/test_scaling_functional.py b/plone/namedfile/tests/test_scaling_functional.py
@@ -10,7 +10,7 @@
 from plone.namedfile.testing import PLONE_NAMEDFILE_FUNCTIONAL_TESTING
 from plone.namedfile.tests import getFile
 from plone.testing.z2 import Browser
-from StringIO import StringIO
+from six.StringIO import StringIO
 from zope.annotation import IAttributeAnnotatable
 from zope.interface import implementer
 

diff --git a/plone/namedfile/utils/__init__.py b/plone/namedfile/utils/__init__.py
@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
-
 from logging import getLogger
 from plone.namedfile.interfaces import IBlobby
 from plone.namedfile.utils.jpeg_utils import process_jpeg
 from plone.namedfile.utils.png_utils import process_png
 from plone.namedfile.utils.tiff_utils import process_tiff
 from plone.registry.interfaces import IRegistry
-from StringIO import StringIO
+from six.StringIO import StringIO
 from zope.component import queryUtility
 from zope.deprecation import deprecate
 

diff --git a/plone/namedfile/utils/jpeg_utils.py b/plone/namedfile/utils/jpeg_utils.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from logging import getLogger
-from StringIO import StringIO
+from six.StringIO import StringIO
 
 import struct
 

diff --git a/plone/namedfile/utils/tiff_utils.py b/plone/namedfile/utils/tiff_utils.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
-
 from logging import getLogger
-from StringIO import StringIO
+from six.StringIO import StringIO
 
 import struct
 

diff --git a/setup.py b/setup.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from setuptools import find_packages
 from setuptools import setup
+
 import os