Merge 25744a0 into beb3161

zopefoundation · Sep 28, 2020 · 1da114a · 1da114a
2 parents beb3161 + 25744a0
commit 1da114a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 39 deletions.
diff --git 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

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -3,9 +3,16 @@ Changelog
 
 For changes before version 3.0, see ``HISTORY.rst``.
 
-4.3 (unreleased)
+5.0 (unreleased)
 ----------------
 
+- Remove deprecated classes and functions in
+  (see `#32 <https://github.com/zopefoundation/AccessControl/issues/32>`_):
+
+  + ``AccessControl/DTML.py``
+  + ``AccessControl/Owned.py``
+  + ``AccessControl/Permissions.py``
+
 - Add deprecation warnings for BBB imports in:
 
   + ``AccessControl/AuthEncoding.py``

diff --git 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
diff --git 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/tests/testOwned.py → src/AccessControl/tests/test_owner.py b/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

diff --git a/src/AccessControl/tests/testRole.py → src/AccessControl/tests/test_rolemanager.py b/src/AccessControl/tests/testRole.py → src/AccessControl/tests/test_rolemanager.py