Python 2 / 3 compatible imports.

CHANGES.rst

@@ -7,6 +7,7 @@ Change Log
 - Do not fail when our base profiles are already registered.
   This may happen in tests if our ``initialize`` code is called twice.
 
+- Improve Python 3 support using six.
 
 1.11.0 (2016-03-01)
 -------------------

Products/PluggableAuthService/UserPropertySheet.py

@@ -21,7 +21,9 @@
 from types import InstanceType
 from types import BooleanType
 
-StringTypes = (str, unicode, )
+import six
+
+StringTypes = (str, six.text_type, )
 _SequenceTypes = (tuple, list, )
 
 from DateTime.DateTime import DateTime

Products/PluggableAuthService/plugins/CookieAuthHelper.py

@@ -18,7 +18,7 @@
 
 from base64 import encodestring, decodestring
 from binascii import Error
-from urllib import quote, unquote
+from six.moves.urllib.parse import quote, unquote
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.Permissions import view

Products/PluggableAuthService/plugins/DelegatingMultiPlugin.py

@@ -20,7 +20,6 @@
 
 # General Python imports
 import copy, os
-from urllib import quote_plus
 
 # Zope imports
 from Acquisition import aq_base

Products/PluggableAuthService/plugins/InlineAuthHelper.py

@@ -17,7 +17,6 @@
 """
 
 from base64 import encodestring, decodestring
-from urllib import quote
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from OFS.Folder import Folder

Products/PluggableAuthService/plugins/ScriptablePlugin.py

@@ -15,8 +15,11 @@
 
 $Id$
 """
-from sets import Set
-from urllib import quote_plus
+try:
+    from sets import Set as set
+except ImportError:
+    pass
+
 from OFS.Folder import Folder
 from AccessControl import ClassSecurityInfo
 from AccessControl.Permissions import manage_users as ManageUsers
@@ -38,6 +41,7 @@ class IScriptablePlugin(Interface):
 
 import Products
 
+
 manage_addScriptablePluginForm = PageTemplateFile(
     'www/spAdd', globals(), __name__='manage_addScriptablePluginForm' )
 
@@ -115,9 +119,9 @@ def _delOb( self, id ):
         myId = self.getId()
         pas_instance = self._getPAS()
         plugins = pas_instance._getOb( 'plugins' )
-        curr_interfaces = Set(providedBy(self))
+        curr_interfaces = set(providedBy(self))
 
-        del_interfaces = Set([x for x in providedBy(self) if id in x.names()])
+        del_interfaces = set([x for x in providedBy(self) if id in x.names()])
 
         for interface in del_interfaces:
             if myId in plugins.listPluginIds( interface ):

Products/PluggableAuthService/plugins/SearchPrincipalsPlugin.py

@@ -18,8 +18,6 @@
 
 # General Python imports
 import copy, os
-from urllib import quote_plus
-
 # Zope imports
 from Acquisition import aq_base
 from OFS.Folder import Folder
@@ -38,6 +36,7 @@
 from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
 from Products.PluggableAuthService.utils import classImplements
 
+
 class ISearchPrincipalsPlugin(Interface):
     """ Marker interface.
     """

Products/PluggableAuthService/plugins/exportimport.py

@@ -57,6 +57,7 @@
 """
 import os, sys
 
+import six
 from xml.dom.minidom import parseString
 
 from Acquisition import Implicit
@@ -142,7 +143,7 @@ def _getNodeAttr(self, node, attrname, default=None):
         if attr is None:
             return default
         value = attr.value
-        if isinstance(value, unicode) and self.encoding is not None:
+        if isinstance(value, six.text_type) and self.encoding is not None:
             value = value.encode(self.encoding)
         return value
 

Products/PluggableAuthService/plugins/tests/helpers.py

@@ -49,7 +49,7 @@ def getGroups( self ):
 
 def makeRequestAndResponse():
     # the POST checking requires a real HTTPRequest
-    from cStringIO import StringIO
+    from six import StringIO
     from ZPublisher.HTTPRequest import HTTPRequest
     from ZPublisher.HTTPResponse import HTTPResponse
 

Products/PluggableAuthService/tests/test_exportimport.py

@@ -17,7 +17,7 @@
 """
 import unittest
 from csv import reader
-from StringIO import StringIO
+from six import StringIO
 
 try:
     import Products.GenericSetup

Products/PluggableAuthService/tests/test_utils.py

@@ -13,6 +13,8 @@
 ##############################################################################
 import unittest
 
+import six
+
 
 class Test_createViewName(unittest.TestCase):
 
@@ -264,10 +266,10 @@ def _createHashedValue(items):
     items = list(items)
     items.sort()
     for k, v in items:
-        if isinstance(k, unicode):
+        if isinstance(k, six.text_type):
             k = k.encode('utf-8')
         hasher.update(k)
-        if isinstance(v, unicode):
+        if isinstance(v, six.text_type):
             v = v.encode('utf-8')
         hasher.update(v)
     return hasher.hexdigest()

Products/PluggableAuthService/utils.py

@@ -20,6 +20,7 @@
 except:
     from sha import new as sha
 
+import six
 
 from AccessControl import ClassSecurityInfo
 from App.Common import package_home
@@ -162,7 +163,7 @@ def allTests( from_dir=product_dir, test_prefix='test' ):
 
 def makestr(s):
     """Converts 's' to a non-Unicode string"""
-    if isinstance(s, unicode):
+    if isinstance(s, six.text_type):
         s = s.encode('utf-8')
     return str(s)
 

setup.py

@@ -48,6 +48,7 @@ def _package_doc(name):
       zip_safe=False,
       install_requires=[
           'setuptools',
+          'six',
           'Zope2 >= 4.0a4',
           'Products.PluginRegistry >= 1.5',
           'Products.GenericSetup >= 1.9.0',