Pin AccessControl 4.2 for the Manage WebDAV Locks permission

CHANGES.rst

@@ -25,6 +25,8 @@ New features
 Bug fixes
 +++++++++
 
+- Pin ``AccessControl`` 4.2 for the `Manage WebDAV Locks` permission
+
 - Fix ``HEAD`` requests on registered views
   (`#816 <https://github.com/zopefoundation/Zope/issues/816>`_)
 

constraints.txt

@@ -1,4 +1,4 @@
-AccessControl==4.1
+AccessControl==4.2
 Acquisition==4.6
 AuthEncoding==4.1
 BTrees==4.6.1

requirements-full.txt

@@ -1,5 +1,5 @@
 -e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope
-AccessControl==4.1
+AccessControl==4.2
 Acquisition==4.6
 AuthEncoding==4.1
 BTrees==4.6.1

setup.py

@@ -69,7 +69,7 @@ def _read_file(filename):
     package_dir={'': 'src'},
     python_requires='>= 3.5',
     install_requires=[
-        'AccessControl >= 4.0b4',
+        'AccessControl >= 4.2',
         'Acquisition',
         'BTrees',
         'Chameleon >= 3.7.0',

src/App/DavLockManager.py

@@ -12,13 +12,13 @@
 ##############################################################################
 
 from AccessControl.class_init import InitializeClass
+from AccessControl.Permissions import webdav_manage_locks
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Implicit
 from Acquisition import aq_base
 from App.special_dtml import DTMLFile
 from OFS.Lockable import wl_isLocked
 from OFS.SimpleItem import Item
-from webdav import webdav_manage_locks
 
 
 class DavLockManager(Item, Implicit):

src/OFS/Lockable.py

@@ -13,14 +13,14 @@
 
 from AccessControl.class_init import InitializeClass
 from AccessControl.Permissions import webdav_lock_items
+from AccessControl.Permissions import webdav_manage_locks
 from AccessControl.Permissions import webdav_unlock_items
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_base
 from OFS.EtagSupport import EtagSupport
 from OFS.interfaces import ILockItem
 from OFS.interfaces import IWriteLock
 from Persistence import PersistentMapping
-from webdav import webdav_manage_locks
 from zope.interface import implementer
 
 

src/webdav/__init__.py

@@ -36,6 +36,3 @@
    Microsoft, U.C. Irvine, Netscape, Novell.  February, 1999."""
 
 enable_ms_public_header = False
-
-# This permission does not exist in AccessControl.Permissions
-webdav_manage_locks = 'Manage WebDAV Locks'

versions-prod.cfg

@@ -4,7 +4,7 @@
 [versions]
 Zope =
 Zope2 = 4.0
-AccessControl = 4.1
+AccessControl = 4.2
 Acquisition = 4.6
 AuthEncoding = 4.1
 BTrees = 4.6.1