Clean up users first step - separate users and user folders

AC-vs-DTML-TODO.txt

@@ -23,7 +23,7 @@ AccessControl
 
 - Remaining outside imports:
 
-  * Various of them in User.py
+  * Various of them in userfolder.py / users.py
 
 
 DocumentTemplate

src/AccessControl/tests/testZopeSecurityPolicy.py

@@ -16,14 +16,12 @@
 import sys
 import unittest
 
-try:
-    from zExceptions import Unauthorized
-except ImportError:
-    Unauthorized = 'Unauthorized'
-from AccessControl.User import UserFolder
-from AccessControl.SecurityManagement import SecurityContext
 from Acquisition import Implicit, Explicit
 from MethodObject import Method
+from zExceptions import Unauthorized
+
+from AccessControl.userfolder import UserFolder
+from AccessControl.SecurityManagement import SecurityContext
 
 
 user_roles = ('RoleOfUser',)

src/AccessControl/tests/testUser.py → src/AccessControl/tests/test_users.py

@@ -18,7 +18,7 @@ import unittest
 class BasicUserTests(unittest.TestCase):
 
     def _getTargetClass(self):
-        from AccessControl.User import BasicUser
+        from AccessControl.users import BasicUser
         return BasicUser
 
     def _makeOne(self, name, password, roles, domains):
@@ -70,7 +70,7 @@ class BasicUserTests(unittest.TestCase):
 class SimpleUserTests(unittest.TestCase):
 
     def _getTargetClass(self):
-        from AccessControl.User import SimpleUser
+        from AccessControl.users import SimpleUser
         return SimpleUser
 
     def _makeOne(self, name='admin', password='123', roles=None, domains=None):
@@ -103,7 +103,7 @@ class SimpleUserTests(unittest.TestCase):
 class SpecialUserTests(unittest.TestCase):
 
     def _getTargetClass(self):
-        from AccessControl.User import SpecialUser
+        from AccessControl.users import SpecialUser
         return SpecialUser
 
     def _makeOne(self, name='admin', password='123', roles=None, domains=None):
@@ -128,7 +128,7 @@ class SpecialUserTests(unittest.TestCase):
 class UnrestrictedUserTests(unittest.TestCase):
 
     def _getTargetClass(self):
-        from AccessControl.User import UnrestrictedUser
+        from AccessControl.users import UnrestrictedUser
         return UnrestrictedUser
 
     def _makeOne(self, name='admin', password='123', roles=None, domains=None):
@@ -176,7 +176,7 @@ class UnrestrictedUserTests(unittest.TestCase):
 class NullUnrestrictedUserTests(unittest.TestCase):
 
     def _getTargetClass(self):
-        from AccessControl.User import NullUnrestrictedUser
+        from AccessControl.users import NullUnrestrictedUser
         return NullUnrestrictedUser
 
     def _makeOne(self):

src/OFS/deprecated.zcml

 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:five="http://namespaces.zope.org/five">
 
-  <!-- deprecated in core Zope, should be fixed there -->
-
   <five:deprecatedManageAddDelete
-      class="AccessControl.User.BasicUserFolder"/>
+      class="AccessControl.userfolder.BasicUserFolder"/>
 
   <five:deprecatedManageAddDelete
       class="HelpSys.HelpTopic.HelpTopicBase"/>