Commit 1c6b9e77 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki Committed by Jérome Perrin

import six.string_types as basestring for Python 3.

parent e474e46a
...@@ -38,6 +38,7 @@ from erp5.component.interface.IEncryptedPassword import IEncryptedPassword ...@@ -38,6 +38,7 @@ from erp5.component.interface.IEncryptedPassword import IEncryptedPassword
from Products.ERP5Type.Globals import PersistentMapping from Products.ERP5Type.Globals import PersistentMapping
from Products.CMFCore.utils import _checkPermission from Products.CMFCore.utils import _checkPermission
from Products.CMFCore.exceptions import AccessControl_Unauthorized from Products.CMFCore.exceptions import AccessControl_Unauthorized
from six import string_types as basestring
@zope.interface.implementer(IEncryptedPassword,) @zope.interface.implementer(IEncryptedPassword,)
class EncryptedPasswordMixin(object): class EncryptedPasswordMixin(object):
......
...@@ -34,7 +34,7 @@ from Products.ERP5Type.XMLObject import XMLObject ...@@ -34,7 +34,7 @@ from Products.ERP5Type.XMLObject import XMLObject
from Products.ERP5Type.Message import translateString from Products.ERP5Type.Message import translateString
from erp5.component.mixin.ConfiguratorItemMixin import ConfiguratorItemMixin from erp5.component.mixin.ConfiguratorItemMixin import ConfiguratorItemMixin
from erp5.component.interface.IConfiguratorItem import IConfiguratorItem from erp5.component.interface.IConfiguratorItem import IConfiguratorItem
from six import string_types as basestring
@zope.interface.implementer(IConfiguratorItem) @zope.interface.implementer(IConfiguratorItem)
class ServiceConfiguratorItem(ConfiguratorItemMixin, XMLObject): class ServiceConfiguratorItem(ConfiguratorItemMixin, XMLObject):
......
...@@ -41,6 +41,7 @@ from erp5.component.module.WorkingCopy import \ ...@@ -41,6 +41,7 @@ from erp5.component.module.WorkingCopy import \
WorkingCopy, Dir, File, selfcached, \ WorkingCopy, Dir, File, selfcached, \
NotAWorkingCopyError, NotVersionedError, VcsConflictError NotAWorkingCopyError, NotVersionedError, VcsConflictError
from erp5.component.module.SubversionClient import newSubversionClient 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 # XXX This does not work with concurrent processes/threads accessing the
# same working copy... # same working copy...
......
...@@ -41,6 +41,7 @@ from DateTime import DateTime ...@@ -41,6 +41,7 @@ from DateTime import DateTime
from ZTUtils import make_query from ZTUtils import make_query
from Products.ERP5.Document.BusinessTemplate import BusinessTemplateFolder from Products.ERP5.Document.BusinessTemplate import BusinessTemplateFolder
from Products.ERP5Type.Utils import simple_decorator from Products.ERP5Type.Utils import simple_decorator
from six import string_types as basestring
@simple_decorator @simple_decorator
def selfcached(func): def selfcached(func):
......
import json import json
from six import string_types as basestring
commit_dict = json.loads(commit_json) if commit_json is not None else { commit_dict = json.loads(commit_json) if commit_json is not None else {
'added': (), 'added': (),
......
from six import string_types as basestring
toggable_pad = None toggable_pad = None
all_knowledge_pads = context.ERP5Site_getKnowledgePadListForUser(mode=mode) all_knowledge_pads = context.ERP5Site_getKnowledgePadListForUser(mode=mode)
if isinstance(knowledge_pad_url, basestring): if isinstance(knowledge_pad_url, basestring):
......
...@@ -32,6 +32,7 @@ from logging import getLogger ...@@ -32,6 +32,7 @@ from logging import getLogger
from urlparse import urlparse from urlparse import urlparse
from lxml import etree from lxml import etree
from copy import deepcopy from copy import deepcopy
from six import string_types as basestring
from AccessControl import ClassSecurityInfo from AccessControl import ClassSecurityInfo
from AccessControl.SecurityManagement import newSecurityManager from AccessControl.SecurityManagement import newSecurityManager
......
...@@ -48,6 +48,7 @@ from xupdate_processor import xuproc ...@@ -48,6 +48,7 @@ from xupdate_processor import xuproc
from base64 import standard_b64decode from base64 import standard_b64decode
from zope.interface import implementer from zope.interface import implementer
from copy import deepcopy from copy import deepcopy
from six import string_types as basestring
import logging import logging
syncml_logger = logging.getLogger('ERP5SyncML') syncml_logger = logging.getLogger('ERP5SyncML')
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
from lxml.builder import ElementMaker from lxml.builder import ElementMaker
from lxml.etree import Element from lxml.etree import Element
from lxml import etree from lxml import etree
from six import string_types as basestring
from erp5.component.module.XMLSyncUtils import resolveSyncmlStatusCode, \ from erp5.component.module.XMLSyncUtils import resolveSyncmlStatusCode, \
encode, resolveSyncmlAlertCode encode, resolveSyncmlAlertCode
......
...@@ -31,6 +31,7 @@ import unittest ...@@ -31,6 +31,7 @@ import unittest
from base64 import b64encode, b64decode, b16encode from base64 import b64encode, b64decode, b16encode
from lxml import etree from lxml import etree
from unittest import expectedFailure from unittest import expectedFailure
from six import string_types as basestring
from AccessControl.SecurityManagement import newSecurityManager from AccessControl.SecurityManagement import newSecurityManager
from ERP5Diff import ERP5Diff from ERP5Diff import ERP5Diff
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
############################################################################## ##############################################################################
from logging import getLogger from logging import getLogger
from six import string_types as basestring
from AccessControl import ClassSecurityInfo from AccessControl import ClassSecurityInfo
......
...@@ -2,6 +2,7 @@ import difflib ...@@ -2,6 +2,7 @@ import difflib
import zipfile import zipfile
import os import os
import re import re
from six import string_types as basestring
from zExceptions import Unauthorized from zExceptions import Unauthorized
separator1 = '=' * 70 separator1 = '=' * 70
......
...@@ -35,6 +35,7 @@ from zLOG import LOG, INFO, WARNING ...@@ -35,6 +35,7 @@ from zLOG import LOG, INFO, WARNING
from erp5.component.module.ERP5Conduit import ERP5Conduit from erp5.component.module.ERP5Conduit import ERP5Conduit
from lxml import etree from lxml import etree
from copy import deepcopy from copy import deepcopy
from six import string_types as basestring
parser = etree.XMLParser(remove_blank_text=True) parser = etree.XMLParser(remove_blank_text=True)
XUPDATE_INSERT_LIST = ('xupdate:insert-after', 'xupdate:insert-before') XUPDATE_INSERT_LIST = ('xupdate:insert-after', 'xupdate:insert-before')
......
...@@ -5,6 +5,7 @@ from Products.ERP5Type.XMLObject import XMLObject ...@@ -5,6 +5,7 @@ from Products.ERP5Type.XMLObject import XMLObject
from zLOG import LOG, WARNING from zLOG import LOG, WARNING
import random, string, hashlib, urllib2, socket import random, string, hashlib, urllib2, socket
from urlparse import urlparse from urlparse import urlparse
from six import string_types as basestring
try: try:
import xml.etree.cElementTree as ET import xml.etree.cElementTree as ET
except ImportError: except ImportError:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment