py3: import six.string_types as basestring (a17bb910).

Co-authored-by: Arnaud Fontaine <arnaud.fontaine@nexedi.com>

bt5/erp5_base/MixinTemplateItem/portal_components/mixin.erp5.EncryptedPasswordMixin.py

@@ -38,6 +38,7 @@ from erp5.component.interface.IEncryptedPassword import IEncryptedPassword
 from Products.ERP5Type.Globals import PersistentMapping
 from Products.CMFCore.utils import _checkPermission
 from Products.CMFCore.exceptions import AccessControl_Unauthorized
+from six import string_types as basestring
 
 @zope.interface.implementer(IEncryptedPassword,)
 class EncryptedPasswordMixin(object):

bt5/erp5_configurator/DocumentTemplateItem/portal_components/document.erp5.ServiceConfiguratorItem.py

@@ -34,7 +34,7 @@ from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.Message import translateString
 from erp5.component.mixin.ConfiguratorItemMixin import ConfiguratorItemMixin
 from erp5.component.interface.IConfiguratorItem import IConfiguratorItem
-
+from six import string_types as basestring
 
 @zope.interface.implementer(IConfiguratorItem)
 class ServiceConfiguratorItem(ConfiguratorItemMixin, XMLObject):

bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.Subversion.py

@@ -41,6 +41,7 @@ from erp5.component.module.WorkingCopy import \
   WorkingCopy, Dir, File, selfcached, \
   NotAWorkingCopyError, NotVersionedError, VcsConflictError
 from erp5.component.module.SubversionClient import newSubversionClient
+from six import string_types as basestring
 
 # XXX This does not work with concurrent processes/threads accessing the
 # same working copy...

bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.WorkingCopy.py

@@ -41,6 +41,7 @@ from DateTime import DateTime
 from ZTUtils import make_query
 from Products.ERP5.Document.BusinessTemplate import BusinessTemplateFolder
 from Products.ERP5Type.Utils import simple_decorator
+from six import string_types as basestring
 
 @simple_decorator
 def selfcached(func):

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsCommit.py

 import json
+from six import string_types as basestring
 
 commit_dict = json.loads(commit_json) if commit_json is not None else {
   'added': (),

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsDiff.py

@@ -8,6 +8,7 @@ else:
 print('<div style="color: black">')
 
 # XXX: ERP5VCS_doCreateJavaScriptStatus should send lists
+from six import string_types as basestring
 if isinstance(added, basestring):
   added = added != 'none' and filter(None, added.split(',')) or ()
 if isinstance(modified, basestring):

bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_toggleActiveKnowledgePad.py

+from six import string_types as basestring
 toggable_pad = None
 all_knowledge_pads = context.ERP5Site_getKnowledgePadListForUser(mode=mode)
 if isinstance(knowledge_pad_url, basestring):

bt5/erp5_oauth2_authorisation/DocumentTemplateItem/portal_components/document.erp5.OAuth2AuthorisationServerConnector.py

@@ -361,7 +361,7 @@ class _ERP5AuthorisationEndpoint(AuthorizationEndpoint):
       for key, value in six.iteritems(request_info_dict):
         if value is None:
           continue
-        if not isinstance(value, basestring):
+        if not isinstance(value, six.string_types):
           raise TypeError((key, repr(value)))
         new_request_info_dict[key] = value
       inner_response = HTTPResponse(stdout=None, stderr=None)
@@ -857,7 +857,7 @@ def _callEndpoint(endpoint, self, REQUEST):
     request_body = urllib.urlencode([
       (x, y)
       for x, y in six.iteritems(REQUEST.form)
-      if isinstance(y, basestring)
+      if isinstance(y, six.string_types)
     ])
   uri = other.get('URL', '')
   query_string = environ.get('QUERY_STRING')

bt5/erp5_test_result/ExtensionTemplateItem/portal_components/extension.erp5.TestResults.py

@@ -2,6 +2,7 @@ import difflib
 import zipfile
 import os
 import re
+from six import string_types as basestring
 from zExceptions import Unauthorized
 
 separator1 = '=' * 70

bt5/erp5_tiosafe_core/ModuleComponentTemplateItem/portal_components/module.erp5.TioSafeBaseConduit.py

@@ -35,6 +35,7 @@ from zLOG import LOG, INFO, WARNING
 from erp5.component.module.ERP5Conduit import ERP5Conduit
 from lxml import etree
 from copy import deepcopy
+from six import string_types as basestring
 parser = etree.XMLParser(remove_blank_text=True)
 
 XUPDATE_INSERT_LIST = ('xupdate:insert-after', 'xupdate:insert-before')

bt5/erp5_web_service/MixinTemplateItem/portal_components/mixin.erp5.RESTAPIClientConnectorMixin.py

@@ -38,6 +38,7 @@ from Products.ERP5Type import Permissions
 from Products.ERP5Type.Timeout import Deadline, TimeoutReachedError
 from Products.ERP5Type.UnrestrictedMethod import super_user
 from zLOG import LOG, ERROR
+from six import string_types as basestring
 
 def isJson(header_dict):
   return header_dict.get('content-type', '').split(';', 1)[0] == 'application/json'

bt5/erp5_wechat_secure_payment/DocumentTemplateItem/portal_components/document.erp5.WechatService.py

@@ -5,6 +5,7 @@ from Products.ERP5Type.XMLObject import XMLObject
 from zLOG import LOG, WARNING
 import random, string, hashlib, urllib2, socket
 from urlparse import urlparse
+from six import string_types as basestring
 try:
   import xml.etree.cElementTree as ET
 except ImportError: