- Prevent DeprecationWarnigs from moved imports in AccessControl

CHANGES.rst

@@ -10,6 +10,8 @@ https://zope.readthedocs.io/en/2.13/CHANGES.html
 4.6.3 (unreleased)
 ------------------
 
+- Prevent ``DeprecationWarnigs`` from moved imports in ``AccessControl``
+
 - make sure "Manager" users can always modify proxy roles
   (`see Products.PythonScripts#50
     <https://github.com/zopefoundation/Products.PythonScripts/issues/50>`_)

src/OFS/tests/testObjectManager.py

@@ -11,10 +11,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.User 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

src/OFS/tests/test_DTMLMethod.py

@@ -16,7 +16,7 @@
 
 def _lock_item(item):
     from OFS.LockItem import LockItem
-    from AccessControl.SpecialUsers import nobody
+    from AccessControl.users import nobody
     item.wl_setLock('token', LockItem(nobody, token='token'))
 
 

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

src/Zope2/App/startup.py

@@ -20,7 +20,7 @@
 
 import six
 
-import AccessControl.User
+import AccessControl.users
 import App.ZApplication
 import OFS.Application
 import ZODB
@@ -137,7 +137,7 @@ def startup():
     DB.classFactory = ClassFactory.ClassFactory
 
     # "Log on" as system user
-    newSecurityManager(None, AccessControl.User.system)
+    newSecurityManager(None, AccessControl.users.system)
 
     # Set up the CA
     load_zcml()

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