Add Python 2 / 3 compatibility

CHANGES.rst

@@ -14,15 +14,16 @@ New features:
 
 Bug fixes:
 
-- *add item here*
+- Add Python 2 / 3 compatibility
+  [pbauer]
 
 
 3.0.7 (2017-05-16)
 ------------------
 
 Bug fixes:
 
-- Add missing entries to requirements in setup.py. 
+- Add missing entries to requirements in setup.py.
   [dhavlik]
 
 

plone/i18n/locales/countries.py

@@ -3,6 +3,8 @@
 from plone.i18n.locales.interfaces import ICountryAvailability
 from zope.interface import implementer
 
+import six
+
 
 @implementer(ICountryAvailability)
 class CountryAvailability(object):
@@ -292,4 +294,4 @@ def getCountryListing(self):
 for code in _countrylist:
     value = _countrylist[code]
     if u'name' in value:
-        value[u'name'] = unicode(value[u'name'], 'utf-8')
+        value[u'name'] = six.text_type(value[u'name'], 'utf-8')

plone/i18n/locales/languages.py

@@ -1,10 +1,11 @@
 # -*- coding: UTF-8 -*-
-
 from plone.i18n.locales.interfaces import IContentLanguageAvailability
 from plone.i18n.locales.interfaces import ILanguageAvailability
 from plone.i18n.locales.interfaces import IMetadataLanguageAvailability
 from zope.interface import implementer
 
+import six
+
 
 @implementer(ILanguageAvailability)
 class LanguageAvailability(object):
@@ -251,9 +252,9 @@ class MetadataLanguageAvailability(LanguageAvailability):
 for code in _languagelist:
     value = _languagelist[code]
     if u'name' in value:
-        value[u'name'] = unicode(value[u'name'], 'utf-8')
+        value[u'name'] = six.text_type(value[u'name'], 'utf-8')
     if u'native' in value:
-        value[u'native'] = unicode(value[u'native'], 'utf-8')
+        value[u'native'] = six.text_type(value[u'native'], 'utf-8')
 
 _combinedlanguagelist = {
 u'ar-ae' : {u'name' : 'Arabic (United Arab Emirates)',                          u'flag' : u'/++resource++country-flags/ae.gif'},
@@ -488,6 +489,6 @@ class MetadataLanguageAvailability(LanguageAvailability):
 for code in _combinedlanguagelist:
     value = _combinedlanguagelist[code]
     if u'name' in value:
-        value[u'name'] = unicode(value[u'name'], 'utf-8')
+        value[u'name'] = six.text_type(value[u'name'], 'utf-8')
     if u'native' in value:
-        value[u'native'] = unicode(value[u'native'], 'utf-8')
+        value[u'native'] = six.text_type(value[u'native'], 'utf-8')

plone/i18n/normalizer/base.py

@@ -2,6 +2,7 @@
 from unicodedata import decomposition
 from unicodedata import normalize
 
+import six
 import string
 
 
@@ -51,7 +52,7 @@ def baseNormalize(text):
       >>> baseNormalize(u"\u5317\u4EB0")
       '53174eb0'
     """
-    if not isinstance(text, basestring):
+    if not isinstance(text, six.string_types):
         # This most surely ends up in something the user does not expect
         # to see. But at least it does not break.
         return repr(text)

plone/i18n/normalizer/tests/test_normalizer.py

@@ -9,9 +9,11 @@
 from zope.component import queryUtility
 
 import doctest
+import six
 import unittest
 
 
+
 def testIDNormalizer():
     """
       >>> util = queryUtility(IIDNormalizer)
@@ -30,7 +32,7 @@ def testIDNormalizer():
       >>> util.normalize(u">>>here'!--s yet another!!!")
       'here-s-yet-another'
 
-      >>> util.normalize(unicode("umläut.doc", 'utf-8'))
+      >>> util.normalize(six.text_type("umläut.doc", 'utf-8'))
       'umlaut-doc'
 
       >>> from plone.i18n.normalizer import MAX_LENGTH
@@ -53,7 +55,7 @@ def testIDNormalizer():
       >>> len(util.normalize(testString)) <= MAX_LENGTH
       True
 
-      >>> util.normalize(unicode("rest `n` peace", 'utf-8'))
+      >>> util.normalize(six.text_type("rest `n` peace", 'utf-8'))
       'rest-n-peace'
 
       >>> util.normalize(u"short-hello-version", max_length=10)
@@ -81,13 +83,13 @@ def testLocaleAwareIDNormalizer():
       >>> util.normalize(u'simpleandsafe', locale='de')
       'simpleandsafe'
 
-      >>> util.normalize(unicode('text with umläut', 'utf-8'), locale='de')
+      >>> util.normalize(six.text_type('text with umläut', 'utf-8'), locale='de')
       'text-with-umlaeut'
 
     Make sure we get the de normalizer as there's no special one for de-DE
     registered.
 
-      >>> util.normalize(unicode('text with umläut', 'utf-8'), locale='de-DE')
+      >>> util.normalize(six.text_type('text with umläut', 'utf-8'), locale='de-DE')
       'text-with-umlaeut'
 
       >>> util.normalize(u'simpleandsafe', locale='pt-BR')
@@ -105,7 +107,7 @@ def testLocaleAwareIDNormalizer():
     Make sure we also handle POSIX-format locale identifiers,
     for backwards-compatibility with an earlier version of plone.i18n.
 
-      >>> util.normalize(unicode('text with umläut', 'utf-8'), locale='de_DE')
+      >>> util.normalize(six.text_type('text with umläut', 'utf-8'), locale='de_DE')
       'text-with-umlaeut'
 
     """
@@ -135,13 +137,13 @@ def testFileNameNormalizer():
       >>> util.normalize("pseudo_filename,pot,#1.doc")
       'pseudo_filename-pot-#1.doc'
 
-      >>> util.normalize(unicode("umläut.doc", 'utf-8'))
+      >>> util.normalize(six.text_type("umläut.doc", 'utf-8'))
       'umlaut.doc'
 
       >>> len(util.normalize(u'aa' * 2000))
       1023
 
-      >>> util.normalize(unicode("rest `n` peace", 'utf-8'))
+      >>> util.normalize(six.text_type("rest `n` peace", 'utf-8'))
       'rest -n- peace'
 
       >>> util.normalize(u"short-hello-version", max_length=10)
@@ -164,13 +166,13 @@ def testLocaleAwareFileNameNormalizer():
       >>> util.normalize(u'simpleandsafe', locale='de')
       'simpleandsafe'
 
-      >>> util.normalize(unicode('text with umläut', 'utf-8'), locale='de')
+      >>> util.normalize(six.text_type('text with umläut', 'utf-8'), locale='de')
       'text with umlaeut'
 
     Make sure we get the de normalizer as there's no special one for de-DE
     registered.
 
-      >>> util.normalize(unicode('text with umläut', 'utf-8'), locale='de-DE')
+      >>> util.normalize(six.text_type('text with umläut', 'utf-8'), locale='de-DE')
       'text with umlaeut'
 
       >>> util.normalize(u'simpleandsafe', locale='pt-BR')
@@ -188,7 +190,7 @@ def testLocaleAwareFileNameNormalizer():
     Make sure we also handle POSIX-format locale identifiers,
     for backwards-compatibility with an earlier version of plone.i18n.
 
-      >>> util.normalize(unicode('text with umläut', 'utf-8'), locale='de_DE')
+      >>> util.normalize(six.text_type('text with umläut', 'utf-8'), locale='de_DE')
       'text with umlaeut'
 
     """
@@ -215,7 +217,7 @@ def testURLNormalizer():
       >>> util.normalize(u"Doe, Joe")
       'doe-joe'
 
-      >>> util.normalize(unicode("umläut.doc", 'utf-8'))
+      >>> util.normalize(six.text_type("umläut.doc", 'utf-8'))
       'umlaut.doc'
 
       >>> util.normalize('quote "this"!')
@@ -230,7 +232,7 @@ def testURLNormalizer():
       >>> util.normalize("I'm a big file.TXT")
       'im-a-big-file.txt'
 
-      >>> util.normalize(unicode("rest `n` peace", 'utf-8'))
+      >>> util.normalize(six.text_type("rest `n` peace", 'utf-8'))
       'rest-n-peace'
 
       >>> len(util.normalize(u'aa' * 2000))
@@ -255,13 +257,13 @@ def testLocaleAwareURLNormalizer():
       >>> util.normalize(u'simpleandsafe', locale='de')
       'simpleandsafe'
 
-      >>> util.normalize(unicode('text with umläut', 'utf-8'), locale='de')
+      >>> util.normalize(six.text_type('text with umläut', 'utf-8'), locale='de')
       'text-with-umlaeut'
 
     Make sure we get the de normalizer as there's no special one for de-DE
     registered.
 
-      >>> util.normalize(unicode('text with umläut', 'utf-8'), locale='de-DE')
+      >>> util.normalize(six.text_type('text with umläut', 'utf-8'), locale='de-DE')
       'text-with-umlaeut'
 
       >>> util.normalize(u'simpleandsafe', locale='pt-BR')
@@ -276,7 +278,7 @@ def testLocaleAwareURLNormalizer():
     Make sure we also handle POSIX-format locale identifiers,
     for backwards-compatibility with an earlier version of plone.i18n.
 
-      >>> util.normalize(unicode('text with umläut', 'utf-8'), locale='de_DE')
+      >>> util.normalize(six.text_type('text with umläut', 'utf-8'), locale='de_DE')
       'text-with-umlaeut'
 
     """

setup.cfg

@@ -4,8 +4,6 @@ ignore =
     .coveragerc
     .editorconfig
     .gitattributes
-    bootstrap.py
-    buildout.cfg
 
 [isort]
 # for details see

setup.py

@@ -32,6 +32,7 @@
         'Products.CMFCore',
         'Products.CMFPlone',
         'setuptools',
+        'six',
         'Unidecode',
         'zope.component',
         'zope.i18n',