From 0a3eaf7ce60f0a32b7680f691ef4dee69f28d50e Mon Sep 17 00:00:00 2001 From: Steffen Allner Date: Mon, 28 Sep 2020 13:42:16 +0200 Subject: [PATCH 1/2] #32 Remove deprecated classes and functions. --- CHANGES.rst | 11 ++++++++- setup.py | 2 +- src/AccessControl/DTML.py | 24 ------------------- src/AccessControl/Owned.py | 11 --------- src/AccessControl/Permissions.py | 11 --------- src/AccessControl/Role.py | 12 ---------- src/AccessControl/User.py | 13 ---------- .../tests/{testOwned.py => test_owner.py} | 2 +- .../{testRole.py => test_rolemanager.py} | 0 9 files changed, 12 insertions(+), 74 deletions(-) delete mode 100644 src/AccessControl/DTML.py rename src/AccessControl/tests/{testOwned.py => test_owner.py} (99%) rename src/AccessControl/tests/{testRole.py => test_rolemanager.py} (100%) diff --git a/CHANGES.rst b/CHANGES.rst index 0fe9ac4..f9b4242 100644 --- a/CHANGES.rst +++ b/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 `_): + + + ``AccessControl/DTML.py`` + + ``AccessControl/Owned.py`` + + ``AccessControl/Permissions.py`` + + ``AccessControl/Role.py`` + + ``AccessControl/User.py`` + 4.2 (2020-04-20) ---------------- diff --git a/setup.py b/setup.py index 814670a..dfca356 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ join('include', 'Acquisition', 'Acquisition.h')]), ] -version = '4.3.dev0' +version = '5.0.dev0' setup(name='AccessControl', diff --git a/src/AccessControl/DTML.py b/src/AccessControl/DTML.py deleted file mode 100644 index 677d673..0000000 --- a/src/AccessControl/DTML.py +++ /dev/null @@ -1,24 +0,0 @@ -############################################################################## -# -# Copyright (c) 2002 Zope Foundation and Contributors. -# -# This software is subject to the provisions of the Zope Public License, -# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -# FOR A PARTICULAR PURPOSE -# -############################################################################## -"""Add security system support to Document Templates -""" - -from zope.deferredimport import deprecated - - -deprecated( - "Please import from DocumentTemplate.security. This backward " - "compatibility shim will be removed in AccessControl version 5.", - DTMLSecurityAPI='DocumentTemplate.security:DTMLSecurityAPI', - RestrictedDTML='DocumentTemplate.security:RestrictedDTML', -) diff --git a/src/AccessControl/Owned.py b/src/AccessControl/Owned.py index d7e8390..7fa11af 100644 --- a/src/AccessControl/Owned.py +++ b/src/AccessControl/Owned.py @@ -13,8 +13,6 @@ """Support for owned objects """ -from zope.deferredimport import deprecated - # BBB from AccessControl.owner import EditUnowned from AccessControl.owner import EmergencyUserCannotOwn @@ -22,12 +20,3 @@ 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', -) diff --git a/src/AccessControl/Permissions.py b/src/AccessControl/Permissions.py index be49ff9..b57365e 100644 --- a/src/AccessControl/Permissions.py +++ b/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, -) diff --git a/src/AccessControl/Role.py b/src/AccessControl/Role.py index 3221b02..996fef7 100644 --- a/src/AccessControl/Role.py +++ b/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', -) diff --git a/src/AccessControl/User.py b/src/AccessControl/User.py index ce243e3..dcff359 100644 --- a/src/AccessControl/User.py +++ b/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', -) diff --git a/src/AccessControl/tests/testOwned.py b/src/AccessControl/tests/test_owner.py similarity index 99% rename from src/AccessControl/tests/testOwned.py rename to src/AccessControl/tests/test_owner.py index c32c8b5..312db78 100644 --- a/src/AccessControl/tests/testOwned.py +++ b/src/AccessControl/tests/test_owner.py @@ -1,4 +1,4 @@ -"""Unit tests for AccessControl.Owned +"""Unit tests for AccessControl.owner """ import unittest diff --git a/src/AccessControl/tests/testRole.py b/src/AccessControl/tests/test_rolemanager.py similarity index 100% rename from src/AccessControl/tests/testRole.py rename to src/AccessControl/tests/test_rolemanager.py From 1a3e1d7db25e114c18063c57047fbfb7abff5660 Mon Sep 17 00:00:00 2001 From: Steffen Allner Date: Mon, 28 Sep 2020 14:56:48 +0200 Subject: [PATCH 2/2] Try to run the tests with current Python 3.7.8. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c7e472d..a549f4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ matrix: env: TOXENV=py35 - python: "3.6" env: TOXENV=py36 - - python: "3.7" + - python: "3.7.8" env: TOXENV=py37 - python: "3.8" env: TOXENV=py38