diff --git a/CHANGES.rst b/CHANGES.rst index 847760764a..195bcb4334 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -11,6 +11,8 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst 5.3 (unreleased) ---------------- +- Prevent ``DeprecationWarnings`` from moved imports in ``AccessControl`` + - make sure "Manager" users can always modify proxy roles (`see Products.PythonScripts#50 `_) diff --git a/src/OFS/tests/testObjectManager.py b/src/OFS/tests/testObjectManager.py index 9c574d6155..20c1ccd802 100644 --- a/src/OFS/tests/testObjectManager.py +++ b/src/OFS/tests/testObjectManager.py @@ -7,10 +7,10 @@ from AccessControl.SecurityManagement import newSecurityManager from AccessControl.SecurityManagement import noSecurityManager from AccessControl.SecurityManager import setSecurityPolicy -from AccessControl.SpecialUsers import emergency_user -from AccessControl.SpecialUsers import nobody -from AccessControl.SpecialUsers import system -from AccessControl.users import User # before SpecialUsers +from AccessControl.users import User +from AccessControl.users import emergency_user +from AccessControl.users import nobody +from AccessControl.users import system from Acquisition import Implicit from Acquisition import aq_self from App.config import getConfiguration diff --git a/src/OFS/tests/test_DTMLMethod.py b/src/OFS/tests/test_DTMLMethod.py index 7fd8e60079..af2064cd35 100644 --- a/src/OFS/tests/test_DTMLMethod.py +++ b/src/OFS/tests/test_DTMLMethod.py @@ -13,7 +13,7 @@ def _lock_item(item): - from AccessControl.SpecialUsers import nobody + from AccessControl.users import nobody from OFS.LockItem import LockItem item.wl_setLock('token', LockItem(nobody, token='token')) diff --git a/src/ZPublisher/tests/testBaseRequest.py b/src/ZPublisher/tests/testBaseRequest.py index cac99454c8..32fdbfcb3f 100644 --- a/src/ZPublisher/tests/testBaseRequest.py +++ b/src/ZPublisher/tests/testBaseRequest.py @@ -491,7 +491,7 @@ class AclUsers(Implicit): def validate(self, request, auth='', roles=_noroles): # always validate access as anonymous, good for checking # if things are publishable regardless of authorization - from AccessControl.SpecialUsers import nobody + from AccessControl.users import nobody return nobody.__of__(self) acl_users = AclUsers() return acl_users diff --git a/src/Zope2/utilities/zconsole.py b/src/Zope2/utilities/zconsole.py index cd8590c31a..8482366422 100644 --- a/src/Zope2/utilities/zconsole.py +++ b/src/Zope2/utilities/zconsole.py @@ -3,7 +3,7 @@ import Zope2 from AccessControl.SecurityManagement import newSecurityManager -from AccessControl.SpecialUsers import system as user +from AccessControl.users import system as user from Testing.makerequest import makerequest from Zope2.Startup.run import make_wsgi_app from zope.globalrequest import setRequest