#32 Remove deprecated classes and functions.

CHANGES.rst

@@ -3,9 +3,18 @@ Changelog
 
 For changes before version 3.0, see ``HISTORY.rst``.
 
-4.3 (unreleased)
+5.0 (unreleased)
 ----------------
 
+- Remove deprecated classes and functions in
+  (`#32 <https://github.com/zopefoundation/AccessControl/issues/32>`_):
+
+  + ``AccessControl/DTML.py``
+  + ``AccessControl/Owned.py``
+  + ``AccessControl/Permissions.py``
+  + ``AccessControl/Role.py``
+  + ``AccessControl/User.py``
+
 
 4.2 (2020-04-20)
 ----------------

setup.py

@@ -32,7 +32,7 @@
                  join('include', 'Acquisition', 'Acquisition.h')]),
 ]
 
-version = '4.3.dev0'
+version = '5.0.dev0'
 
 
 setup(name='AccessControl',

src/AccessControl/Owned.py

@@ -13,21 +13,10 @@
 """Support for owned objects
 """
 
-from zope.deferredimport import deprecated
-
 # BBB
 from AccessControl.owner import EditUnowned
 from AccessControl.owner import EmergencyUserCannotOwn
 from AccessControl.owner import UnownableOwner
 from AccessControl.owner import absattr
 from AccessControl.owner import ownableFilter
 from AccessControl.owner import 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/Permissions.py

@@ -13,9 +13,6 @@
 """Constant definitions for built-in Zope permissions
 """
 
-from zope.deferredimport import deprecated
-
-
 access_contents_information = 'Access contents information'
 add_database_methods = 'Add Database Methods'
 add_documents_images_and_files = 'Add Documents, Images, and Files'
@@ -67,11 +64,3 @@
 webdav_manage_locks = 'Manage WebDAV Locks'
 webdav_unlock_items = 'WebDAV Unlock items'
 new_loc = 'DocumentTemplate.permissions'
-
-deprecated(
-    "This permission has moved to %s, please import from there. "
-    "This backward compatibility shim will be removed in AccessControl "
-    "version 5." % new_loc,
-    change_dtml_documents='%s:change_dtml_documents' % new_loc,
-    change_dtml_methods='%s:change_dtml_methods' % new_loc,
-)

src/AccessControl/Role.py

@@ -13,8 +13,6 @@
 """Access control support
 """
 
-from zope.deferredimport import deprecated
-
 # BBB
 from AccessControl.rolemanager import DEFAULTMAXLISTUSERS
 from AccessControl.rolemanager import _isBeingUsedAsAMethod
@@ -26,13 +24,3 @@
 from AccessControl.rolemanager import instance_attrs
 from AccessControl.rolemanager import instance_dict
 from AccessControl.rolemanager import 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

@@ -13,8 +13,6 @@
 """Access control package.
 """
 
-from zope.deferredimport import deprecated
-
 # BBB
 from AccessControl.users import BasicUser
 from AccessControl.users import NullUnrestrictedUser
@@ -36,14 +34,3 @@
 
 
 from AccessControl.users import UnrestrictedUser # noqa isort:skip
-
-
-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.",
-    BasicUserFolder='OFS.userfolder:BasicUserFolder',
-    manage_addUserFolder='OFS.userfolder:manage_addUserFolder',
-    UserFolder='OFS.userfolder:UserFolder',
-)

src/AccessControl/tests/testOwned.py → src/AccessControl/tests/test_owner.py

@@ -1,4 +1,4 @@
-"""Unit tests for AccessControl.Owned
+"""Unit tests for AccessControl.owner
 """
 
 import unittest