rewrite deprecated imports that will be removed in the future.

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

@@ -30,7 +30,7 @@
 ##############################################################################
 import zope.interface
 from AccessControl import ClassSecurityInfo
-from AccessControl.AuthEncoding import pw_encrypt, pw_validate
+from AuthEncoding.AuthEncoding import pw_encrypt, pw_validate
 from Products.ERP5Type.Globals import InitializeClass
 from Acquisition import aq_base
 from Products.ERP5Type import Permissions

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

@@ -31,7 +31,7 @@ import zope.interface
 
 from Products.ERP5Type import Permissions
 from erp5.component.interface.ILoginAccountProvider import ILoginAccountProvider
-from AccessControl.AuthEncoding import pw_validate
+from AuthEncoding.AuthEncoding import pw_validate
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type.Globals import InitializeClass
 

bt5/erp5_big_file/DocumentTemplateItem/portal_components/document.erp5.BigFile.py

@@ -22,7 +22,7 @@ from erp5.component.document.File import File, _MARKER
 from erp5.component.module.BTreeData import BTreeData
 from ZPublisher.HTTPRequest import FileUpload
 from ZPublisher import HTTPRangeSupport
-from webdav.common import rfc1123_date
+from zope.datetime import rfc1123_date
 from mimetools import choose_boundary
 from Products.CMFCore.utils import _setCacheHeaders, _ViewEmulator
 from DateTime import DateTime

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testAlarm.py

@@ -30,7 +30,7 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from Products.ERP5Type.UnrestrictedMethod import super_user
 from AccessControl.SecurityManagement import newSecurityManager, \
         getSecurityManager, setSecurityManager
-from AccessControl.User import nobody
+from AccessControl.users import nobody
 from AccessControl import Unauthorized
 from DateTime import DateTime
 from erp5.component.module.DateUtils import addToDate

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testCookieCrumbler.py

@@ -18,7 +18,7 @@ import urllib
 
 from OFS.DTMLMethod import DTMLMethod
 from OFS.Folder import Folder
-from AccessControl.User import UserFolder
+from AccessControl.users import UserFolder
 
 from Products.CMFCore.CookieCrumbler import CookieCrumbler
 from Products.CMFCore.tests.test_CookieCrumbler import makerequest

product/CMFActivity/ActivityTool.py

@@ -47,7 +47,7 @@ from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.SecurityManagement import noSecurityManager
 from AccessControl.SecurityManagement import setSecurityManager
 from AccessControl.SecurityManagement import getSecurityManager
-from AccessControl.User import system as system_user
+from AccessControl.users import system as system_user
 from Products.CMFCore.utils import UniqueObject
 from Products.ERP5Type.Globals import InitializeClass, DTMLFile
 from Acquisition import aq_base, aq_inner, aq_parent

product/ERP5/Document/Alarm.py

@@ -36,7 +36,7 @@ from DateTime import DateTime
 from AccessControl import ClassSecurityInfo, Unauthorized
 from AccessControl.SecurityManagement import getSecurityManager, \
             setSecurityManager, newSecurityManager
-from AccessControl.User import nobody
+from AccessControl.users import nobody
 from Products.CMFActivity.ActivityRuntimeEnvironment import getActivityRuntimeEnvironment
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.XMLObject import XMLObject

product/ERP5/Document/BusinessTemplate.py

@@ -40,7 +40,7 @@ from AccessControl import ClassSecurityInfo, Unauthorized
 from AccessControl.SecurityInfo import ModuleSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager, \
   newSecurityManager, setSecurityManager
-from AccessControl.User import nobody
+from AccessControl.users import nobody
 from Products.CMFCore.utils import getToolByName
 from Products.PythonScripts.PythonScript import PythonScript
 from Products.ZSQLMethods.SQL import SQL

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.Delivery.py

@@ -34,7 +34,7 @@ import zope.interface
 from AccessControl import ClassSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager, \
     setSecurityManager, newSecurityManager
-from AccessControl.User import nobody
+from AccessControl.users import nobody
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter
 from Products.ERP5Type.XMLObject import XMLObject

product/ERP5Catalog/CatalogTool.py

@@ -36,7 +36,7 @@ from Products.ZSQLCatalog.ZSQLCatalog import ZCatalog
 from Products.ZSQLCatalog.SQLCatalog import ComplexQuery, SimpleQuery
 from Products.ERP5Type import Permissions
 from AccessControl import ClassSecurityInfo, getSecurityManager
-from AccessControl.User import system as system_user
+from AccessControl.users import system as system_user
 from Products.CMFCore.utils import UniqueObject, _getAuthenticatedUser, getToolByName
 from Products.ERP5Type.Globals import InitializeClass, DTMLFile
 from Acquisition import aq_base, aq_inner, aq_parent, ImplicitAcquisitionWrapper

product/ERP5Security/ERP5LoginUserManager.py

@@ -28,7 +28,7 @@
 from functools import partial
 from Products.ERP5Type.Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
-from AccessControl.AuthEncoding import pw_validate
+from AuthEncoding.AuthEncoding import pw_validate
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
 from Products.PluggableAuthService.utils import classImplements

product/ERP5Security/ERP5UserManager.py

@@ -19,7 +19,7 @@ from six import string_types as basestring
 from Products.ERP5Type.Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 from AccessControl.SecurityInfo import ModuleSecurityInfo
-from AccessControl.AuthEncoding import pw_validate
+from AuthEncoding.AuthEncoding import pw_validate
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PluggableAuthService.PluggableAuthService import \
     _SWALLOWABLE_PLUGIN_EXCEPTIONS

product/ERP5Type/UnrestrictedMethod.py

@@ -27,7 +27,7 @@
 ##############################################################################
 
 from contextlib import contextmanager
-from AccessControl.User import UnrestrictedUser
+from AccessControl.users import UnrestrictedUser
 from AccessControl.SpecialUsers import system
 from AccessControl.SecurityManagement import getSecurityManager, \
         newSecurityManager, setSecurityManager

product/ERP5Type/patches/AcceleratedHTTPCacheManager.py

 import time
 from Products.StandardCacheManagers.AcceleratedHTTPCacheManager import \
     AcceleratedHTTPCache, AcceleratedHTTPCacheManager
-from App.Common import rfc1123_date
+from zope.datetime import rfc1123_date
 from App.special_dtml import DTMLFile
 from Products.ERP5Type import _dtmldir
 

product/ERP5Type/patches/CachingPolicyManager.py

@@ -2,7 +2,7 @@ from Products.CMFCore.CachingPolicyManager import CachingPolicy, \
     CachingPolicyManager, createCPContext
 from App.special_dtml import DTMLFile
 from Products.CMFCore.Expression import Expression
-from App.Common import rfc1123_date
+from zope.datetime import rfc1123_date
 from DateTime.DateTime import DateTime
 from Products.ERP5Type import _dtmldir
 

product/ERP5Type/patches/PropertiedUser.py

@@ -37,7 +37,7 @@ def getRolesInContext(self, object):
     o Include *both* local roles assigned directly to us *and* those
       assigned to our groups.
 
-    o Ripped off from AccessControl.User.BasicUser, which provides
+    o Ripped off from AccessControl.users.BasicUser, which provides
       no other extension mechanism. :(
     """
     principal_id_list = [self.getId()]
@@ -74,7 +74,7 @@ def allowed(self, object, object_roles=None):
     o Include *both* local roles assigned directly to us *and* those
       assigned to our groups.
 
-    o Ripped off from AccessControl.User.BasicUser, which provides
+    o Ripped off from AccessControl.users.BasicUser, which provides
       no other extension mechanism. :(
     """
     if object_roles is _what_not_even_god_should_do:

product/ERP5Type/patches/User.py

@@ -15,7 +15,7 @@
 
 from threading import local
 from Acquisition import aq_inner, aq_parent
-from AccessControl.User import SimpleUser
+from AccessControl.users import SimpleUser
 from App.config import getConfiguration
 from ..TransactionalVariable import TransactionalVariable
 

product/MailTemplates/tests/test_FSMailTemplate.py

@@ -8,7 +8,7 @@ from __future__ import absolute_import
 import os
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.SecurityManagement import noSecurityManager
-from AccessControl.User import system as SystemUser,SimpleUser
+from AccessControl.users import system as SystemUser,SimpleUser
 from OFS.Folder import Folder
 from .test_MailTemplate import DummyMailHost,Zope,get_transaction
 from Testing.makerequest import makerequest

product/MailTemplates/tests/test_MailTemplate.py

@@ -13,7 +13,7 @@ except ImportError:
 
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.SecurityManagement import noSecurityManager
-from AccessControl.User import system as SystemUser, SimpleUser
+from AccessControl.users import system as SystemUser, SimpleUser
 from six.moves import cStringIO as StringIO
 from difflib import unified_diff
 from Products.MailHost.MailHost import MailHost