Merge remote-tracking branch 'origin/master' into plonezope4

CHANGES.rst

@@ -50,10 +50,14 @@ Features Added
 
 - Updated distributions:
 
+    - AccessControl = 4.0a4
     - Acquisition = 4.3.0
     - BTrees = 4.4.0
     - DocumentTemplate = 3.0a1
+    - ExtensionClass = 4.2.1
+    - Persistence = 3.0a3
     - persistent = 4.2.2
+    - Products.ZCatalog = 4.0a3
     - pytz = 2016.10
     - WebOb = 1.7.1
     - WebTest = 2.0.24

requirements-full.txt

@@ -1,20 +1,20 @@
 -e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope2
-AccessControl==4.0a3
+AccessControl==4.0a4
 Acquisition==4.3.0
 AuthEncoding==4.0.0
 BTrees==4.4.0
 Chameleon==2.25
 DateTime==4.1.1
 DocumentTemplate==3.0a1
-ExtensionClass==4.1.2
+ExtensionClass==4.2.1
 Missing==3.1
 MultiMapping==3.0
 PasteDeploy==1.5.2
-Persistence==3.0a1
+Persistence==3.0a3
 Products.BTreeFolder2==3.0
 Products.MailHost==3.0
 Products.ZCTextIndex==4.0.1
-Products.ZCatalog==4.0a2
+Products.ZCatalog==4.0a3
 Record==3.1
 RestrictedPython==3.6.0
 WSGIProxy2==0.4.2

setup.py

@@ -49,7 +49,7 @@ def _read_file(filename):
     namespace_packages=['Products', 'Shared', 'Shared.DC'],
     package_dir={'': 'src'},
     install_requires=[
-        'AccessControl>=4.0a1',
+        'AccessControl>=4.0a4',
         'Acquisition',
         'BTrees',
         'DateTime',

sources.cfg

@@ -21,7 +21,7 @@ zope.globalrequest = git ${remotes:github}/zope.globalrequest pushurl=${remotes:
 Missing = git ${remotes:github}/Missing pushurl=${remotes:github_push}/Missing
 Products.BTreeFolder2 = git ${remotes:github}/Products.BTreeFolder2 pushurl=${remotes:github_push}/Products.BTreeFolder2
 Products.MailHost = git ${remotes:github}/Products.MailHost pushurl=${remotes:github_push}/Products.MailHost
-Products.ZCatalog = git ${remotes:github}/Products.ZCatalog pushurl=${remotes:github_push}/Products.ZCatalog branch=master
+Products.ZCatalog = git ${remotes:github}/Products.ZCatalog pushurl=${remotes:github_push}/Products.ZCatalog
 Products.ZCTextIndex = git ${remotes:github}/Products.ZCTextIndex pushurl=${remotes:github_push}/Products.ZCTextIndex
 Record = git ${remotes:github}/Record pushurl=${remotes:github_push}/Record
 ZServer = git ${remotes:github}/ZServer pushurl=${remotes:github_push}/ZServer

src/OFS/FindSupport.py

@@ -12,12 +12,9 @@
 ##############################################################################
 """Find support
 """
-
-from string import translate
-
 from AccessControl import ClassSecurityInfo
 from AccessControl.class_init import InitializeClass
-from AccessControl.Permission import name_trans
+from AccessControl.Permission import getPermissionIdentifier
 from AccessControl.Permissions import view_management_screens
 from Acquisition import aq_base, aq_parent
 from App.special_dtml import DTMLFile
@@ -92,7 +89,7 @@ def ZopeFindAndApply(self, obj, obj_ids=None, obj_metatypes=None,
                 obj_mtime = DateTime(obj_mtime).timeTime()
 
             if obj_permission:
-                obj_permission = p_name(obj_permission)
+                obj_permission = getPermissionIdentifier(obj_permission)
 
             if obj_roles and isinstance(obj_roles, str):
                 obj_roles = [obj_roles]
@@ -218,7 +215,3 @@ def absattr(attr):
     if isinstance(attr, collections.Callable):
         return attr()
     return attr
-
-
-def p_name(name):
-    return '_' + translate(name, name_trans) + '_Permission'

versions-prod.cfg

@@ -2,26 +2,26 @@
 
 [versions]
 Zope2 =
-AccessControl = 4.0a3
+AccessControl = 4.0a4
 AuthEncoding = 4.0.0
 Acquisition = 4.3.0
 BTrees = 4.4.0
 Chameleon = 2.25
 DateTime = 4.1.1
 DocumentTemplate = 3.0a1
-ExtensionClass = 4.1.2
+ExtensionClass = 4.2.1
 five.globalrequest = 1.0
 funcsigs = 1.0.2
 mock = 2.0.0
 Missing = 3.1
 MultiMapping = 3.0
 PasteDeploy = 1.5.2
 pbr = 1.10.0
-Persistence = 3.0a1
+Persistence = 3.0a3
 persistent = 4.2.2
 Products.BTreeFolder2 = 3.0
 Products.MailHost = 3.0
-Products.ZCatalog = 4.0a2
+Products.ZCatalog = 4.0a3
 Products.ZCTextIndex = 4.0.1
 pytz = 2016.10
 Record = 3.1