Merge 0e71969 into f8c05c0

CHANGES.rst

@@ -11,6 +11,7 @@ For changes before version 3.0, see ``HISTORY.rst``.
 
   + ``AccessControl/DTML.py``
   + ``AccessControl/Owned.py``
+  + ``AccessControl/Role.py``
   + ``AccessControl/Permissions.py``
 
 - Add deprecation warnings for BBB imports in:

src/AccessControl/Owned.py

@@ -28,11 +28,3 @@
     ownableFilter='AccessControl.owner:ownableFilter',
     ownerInfo='AccessControl.owner:ownerInfo',
 )
-
-deprecated(
-    "The Owned class has moved to OFS.owner. This compatibility "
-    "shim will be removed in AccessControl version 5. Please "
-    "depend on Zope2 and import from OFS.owner or use the "
-    "new minimal Owned class from AccessControl.owner.",
-    Owned='OFS.owner:Owned',
-)

src/AccessControl/Role.py

@@ -32,12 +32,3 @@
     instance_dict='AccessControl.rolemanager:instance_dict',
     reqattr='AccessControl.rolemanager:reqattr',
 )
-
-deprecated(
-    "RoleManager has moved to OFS.role. Please "
-    "depend on Zope and import from OFS.role or use the new minimal "
-    "RoleManager class from AccessControl.rolemanager. "
-    "This backward compatibility shim will be removed in AccessControl "
-    "version 5.",
-    RoleManager='OFS.role:RoleManager',
-)

src/AccessControl/User.py

@@ -42,10 +42,12 @@
 )
 
 deprecated(
-    "The standard Zope user folder implementation has moved to "
-    "OFS.userfolder.  Please depend on Zope2 and import from "
-    "OFS.userfolder or use the new minimal "
-    "user folder classes from AccessControl.userfolder.",
+    "The standard Zope user folder implementation has moved to"
+    " OFS.userfolder.  Please depend on Zope and import from "
+    " OFS.userfolder or use the new minimal "
+    " user folder classes from AccessControl.userfolder."
+    " This backward compatibility shim will be removed in AccessControl"
+    " version 6.",
     BasicUserFolder='OFS.userfolder:BasicUserFolder',
     manage_addUserFolder='OFS.userfolder:manage_addUserFolder',
     UserFolder='OFS.userfolder:UserFolder',