From 1373123f3d426fffbf39bc5613a6a5c90323e163 Mon Sep 17 00:00:00 2001
From: Michael Howitz <mh@gocept.com>
Date: Wed, 1 Feb 2017 21:03:11 +0100
Subject: [PATCH] Add compatibility with AccessControl 4.0a4.

---
 buildout.cfg                      | 1 +
 setup.py                          | 2 +-
 src/Products/ZCatalog/ZCatalog.py | 9 ++-------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/buildout.cfg b/buildout.cfg
index 1c6cd723..bcd6e076 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -6,6 +6,7 @@ parts = interpreter test
 
 [versions]
 Products.ZCatalog =
+AccessControl = 4.0a4
 
 [interpreter]
 recipe = zc.recipe.egg
diff --git a/setup.py b/setup.py
index cf726c06..0501555a 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@
     ],
     install_requires=[
         'setuptools',
-        'AccessControl',
+        'AccessControl >= 4.0a4',
         'Acquisition',
         'BTrees',
         'DateTime',
diff --git a/src/Products/ZCatalog/ZCatalog.py b/src/Products/ZCatalog/ZCatalog.py
index 09556cad..66c8fb84 100644
--- a/src/Products/ZCatalog/ZCatalog.py
+++ b/src/Products/ZCatalog/ZCatalog.py
@@ -16,12 +16,11 @@
 import logging
 import operator
 import sys
-import string
 import time
 import urllib
 
 from AccessControl.class_init import InitializeClass
-from AccessControl.Permission import name_trans
+from AccessControl.Permission import getPermissionIdentifier
 from AccessControl.Permissions import manage_zcatalog_entries
 from AccessControl.Permissions import manage_zcatalog_indexes
 from AccessControl.Permissions import search_zcatalog
@@ -669,7 +668,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]
@@ -930,10 +929,6 @@ def manage_editCatalogReport(self, long_query_time=0.1, REQUEST=None):
 InitializeClass(ZCatalog)
 
 
-def p_name(name):
-    return '_' + string.translate(name, name_trans) + '_Permission'
-
-
 def absattr(attr):
     if callable(attr):
         return attr()