Merge branch 'master' into py39

zopefoundation · Oct 7, 2020 · 30c2986 · 30c2986
2 parents bf844f5 + f8c05c0
commit 30c2986
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/AccessControl/Permissions.py b/src/AccessControl/Permissions.py
@@ -63,4 +63,3 @@
 webdav_lock_items = 'WebDAV Lock items'
 webdav_manage_locks = 'Manage WebDAV Locks'
 webdav_unlock_items = 'WebDAV Unlock items'
-new_loc = 'DocumentTemplate.permissions'
diff --git a/src/AccessControl/ZopeGuards.py b/src/AccessControl/ZopeGuards.py
@@ -642,7 +642,7 @@ def protected_inplacevar(op, var, expr):
     """Do an inplace operation
 
     If the var has an inplace slot, then disallow the operation
-    unless the var is a list.
+    unless the var an instance of ``valid_inplace_types``.
     """
     if hasattr(var, inplace_slots[op]) and \
        not isinstance(var, valid_inplace_types):