AccessControl 6.3__tar.gz → 7.1__tar.gz

{AccessControl-6.3 → accesscontrol-7.1}/.manylinux-install.sh

@@ -28,12 +28,12 @@ yum -y install libffi-devel
 
 tox_env_map() {
     case $1 in
-        *"cp37"*) echo 'py37';;
         *"cp38"*) echo 'py38';;
         *"cp39"*) echo 'py39';;
         *"cp310"*) echo 'py310';;
         *"cp311"*) echo 'py311';;
         *"cp312"*) echo 'py312';;
+        *"cp313"*) echo 'py313';;
         *) echo 'py';;
     esac
 }
@@ -41,12 +41,12 @@ tox_env_map() {
 # Compile wheels
 for PYBIN in /opt/python/*/bin; do
     if \
-       [[ "${PYBIN}" == *"cp311"* ]] || \
-       [[ "${PYBIN}" == *"cp312"* ]] || \
-       [[ "${PYBIN}" == *"cp37"* ]] || \
-       [[ "${PYBIN}" == *"cp38"* ]] || \
-       [[ "${PYBIN}" == *"cp39"* ]] || \
-       [[ "${PYBIN}" == *"cp310"* ]] ; then
+       [[ "${PYBIN}" == *"cp38/"* ]] || \
+       [[ "${PYBIN}" == *"cp39/"* ]] || \
+       [[ "${PYBIN}" == *"cp310/"* ]] || \
+       [[ "${PYBIN}" == *"cp311/"* ]] || \
+       [[ "${PYBIN}" == *"cp312/"* ]] || \
+       [[ "${PYBIN}" == *"cp313/"* ]] ; then
         "${PYBIN}/pip" install -e /io/
         "${PYBIN}/pip" wheel /io/ -w wheelhouse/
         if [ `uname -m` == 'aarch64' ]; then

accesscontrol-7.1/.pre-commit-config.yaml

@@ -0,0 +1,28 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/c-code
+minimum_pre_commit_version: '3.6'
+repos:
+  - repo: https://github.com/pycqa/isort
+    rev: "5.13.2"
+    hooks:
+    - id: isort
+  - repo: https://github.com/hhatto/autopep8
+    rev: "v2.3.1"
+    hooks:
+    - id: autopep8
+      args: [--in-place, --aggressive, --aggressive]
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.17.0
+    hooks:
+    - id: pyupgrade
+      args: [--py38-plus]
+  - repo: https://github.com/isidentical/teyit
+    rev: 0.4.3
+    hooks:
+    - id: teyit
+  - repo: https://github.com/PyCQA/flake8
+    rev: "7.1.1"
+    hooks:
+    - id: flake8
+      additional_dependencies:
+        - flake8-debugger == 4.1.2

{AccessControl-6.3 → accesscontrol-7.1}/CHANGES.rst

@@ -3,6 +3,40 @@ Changelog
 
 For changes before version 3.0, see ``HISTORY.rst``.
 
+7.1 (2024-10-10)
+----------------
+
+- Add final support for Python 3.13.
+
+- Respect ``PURE_PYTHON`` environment variable set to ``0`` when running tests.
+
+- Let the roles access in ``rolesForPermissionOn`` interpret ``AttributeError``
+  and ``Unauthorized`` as "no roles definition for this permission at this
+  object" and report any other exception (for the Python and C implementation).
+  We have to treat ``Unauthorized`` like ``AttributeError`` to support
+  ``Shared.DC.Scripts.Bindings.UnauthorizedBinding`` which raises
+  ``Unauthorized`` for any access.
+
+
+7.0 (2024-05-30)
+----------------
+
+- Add preliminary support for Python 3.13 as of 3.13b1.
+
+- Remove support for Python 3.7.
+
+- Build Windows wheels on GHA.
+
+- Make dict views (`.keys()`, `.items()` and `.values()`) behave like their
+  unrestricted versions.
+  (`#147 <https://github.com/zopefoundation/AccessControl/pull/147>`_)
+
+- Make `.items()` validate each keys and values, like `.keys()` and
+  `.values()` do.
+
+- Fix build errors on recent macOS versions.
+
+
 6.3 (2023-11-20)
 ----------------
 

{AccessControl-6.3 → accesscontrol-7.1}/MANIFEST.in

@@ -5,8 +5,7 @@ include *.rst
 include *.txt
 include buildout.cfg
 include tox.ini
-include appveyor.yml
-include .coveragerc
+include .pre-commit-config.yaml
 
 recursive-include src *.py
 include *.sh

{AccessControl-6.3 → accesscontrol-7.1}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: AccessControl
-Version: 6.3
+Version: 7.1
 Summary: Security framework for Zope.
 Home-page: https://github.com/zopefoundation/AccessControl
 Author: Zope Foundation and Contributors
-Author-email: zope-dev@zope.org
+Author-email: zope-dev@zope.dev
 License: ZPL 2.1
 Project-URL: Issue Tracker, https://github.com/zopefoundation/AccessControl/issues
 Project-URL: Sources, https://github.com/zopefoundation/AccessControl
@@ -17,14 +17,15 @@ Classifier: License :: OSI Approved :: Zope Public License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Requires-Python: >=3.7
+Requires-Python: >=3.8
+Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: Acquisition
 Requires-Dist: AuthEncoding
@@ -32,7 +33,7 @@ Requires-Dist: BTrees
 Requires-Dist: DateTime
 Requires-Dist: ExtensionClass>=4.2.1
 Requires-Dist: Persistence>=3.0a3
-Requires-Dist: RestrictedPython>=5.1
+Requires-Dist: RestrictedPython>=7.4
 Requires-Dist: transaction
 Requires-Dist: zExceptions
 Requires-Dist: zope.component
@@ -43,7 +44,6 @@ Requires-Dist: zope.publisher
 Requires-Dist: zope.schema
 Requires-Dist: zope.security
 Requires-Dist: zope.testing
-Requires-Dist: funcsigs; python_version < "3.3"
 Provides-Extra: test
 Requires-Dist: zope.testrunner; extra == "test"
 
@@ -73,6 +73,40 @@ Changelog
 
 For changes before version 3.0, see ``HISTORY.rst``.
 
+7.1 (2024-10-10)
+----------------
+
+- Add final support for Python 3.13.
+
+- Respect ``PURE_PYTHON`` environment variable set to ``0`` when running tests.
+
+- Let the roles access in ``rolesForPermissionOn`` interpret ``AttributeError``
+  and ``Unauthorized`` as "no roles definition for this permission at this
+  object" and report any other exception (for the Python and C implementation).
+  We have to treat ``Unauthorized`` like ``AttributeError`` to support
+  ``Shared.DC.Scripts.Bindings.UnauthorizedBinding`` which raises
+  ``Unauthorized`` for any access.
+
+
+7.0 (2024-05-30)
+----------------
+
+- Add preliminary support for Python 3.13 as of 3.13b1.
+
+- Remove support for Python 3.7.
+
+- Build Windows wheels on GHA.
+
+- Make dict views (`.keys()`, `.items()` and `.values()`) behave like their
+  unrestricted versions.
+  (`#147 <https://github.com/zopefoundation/AccessControl/pull/147>`_)
+
+- Make `.items()` validate each keys and values, like `.keys()` and
+  `.values()` do.
+
+- Fix build errors on recent macOS versions.
+
+
 6.3 (2023-11-20)
 ----------------
 

accesscontrol-7.1/pyproject.toml

@@ -0,0 +1,25 @@
+# 
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/c-code
+
+[build-system]
+requires = ["setuptools<74"]
+build-backend = "setuptools.build_meta"
+
+[tool.coverage.run]
+branch = true
+source = ["AccessControl"]
+relative_files = true
+
+[tool.coverage.report]
+fail_under = 80
+precision = 2
+ignore_errors = true
+show_missing = true
+exclude_lines = ["pragma: no cover", "pragma: nocover", "except ImportError:", "raise NotImplementedError", "if __name__ == '__main__':", "self.fail", "raise AssertionError", "raise unittest.Skip"]
+
+[tool.coverage.html]
+directory = "parts/htmlcov"
+
+[tool.coverage.paths]
+source = ["src/", ".tox/*/lib/python*/site-packages/", ".tox/pypy*/site-packages/"]

{AccessControl-6.3 → accesscontrol-7.1}/setup.cfg

@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 0
-
 [zest.releaser]
 create-wheel = no
 

{AccessControl-6.3 → accesscontrol-7.1}/setup.py

@@ -32,7 +32,7 @@ ext_modules = [
                  join('include', 'Acquisition', 'Acquisition.h')]),
 ]
 
-version = '6.3'
+version = '7.1'
 
 
 setup(name='AccessControl',
@@ -47,8 +47,9 @@ setup(name='AccessControl',
       description='Security framework for Zope.',
       keywords='security access authorization',
       author='Zope Foundation and Contributors',
-      author_email='zope-dev@zope.org',
+      author_email='zope-dev@zope.dev',
       long_description=README + '\n\n' + CHANGES,
+      long_description_content_type='text/x-rst',
       packages=find_packages('src'),
       package_dir={'': 'src'},
       classifiers=[
@@ -60,12 +61,12 @@ setup(name='AccessControl',
           'Operating System :: OS Independent',
           'Programming Language :: Python',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
           'Programming Language :: Python :: 3.9',
           'Programming Language :: Python :: 3.10',
           'Programming Language :: Python :: 3.11',
           'Programming Language :: Python :: 3.12',
+          'Programming Language :: Python :: 3.13',
           'Programming Language :: Python :: Implementation :: CPython',
       ],
       ext_modules=ext_modules,
@@ -76,7 +77,7 @@ setup(name='AccessControl',
           'DateTime',  # optional dependency of RestrictedPython
           'ExtensionClass >= 4.2.1',
           'Persistence >= 3.0a3',
-          'RestrictedPython >= 5.1',
+          'RestrictedPython >= 7.4',
           'transaction',
           'zExceptions',
           'zope.component',
@@ -87,9 +88,8 @@ setup(name='AccessControl',
           'zope.schema',
           'zope.security',
           'zope.testing',
-          'funcsigs;python_version<"3.3"',
       ],
-      python_requires='>=3.7',
+      python_requires='>=3.8',
       include_package_data=True,
       zip_safe=False,
       extras_require={

{AccessControl-6.3 → accesscontrol-7.1}/src/AccessControl/ImplPython.py

@@ -31,6 +31,7 @@ from Acquisition import aq_inner
 from Acquisition import aq_parent
 from ExtensionClass import Base
 from zope.interface import implementer
+from zExceptions import Unauthorized as zExceptions_Unauthorized
 
 PURE_PYTHON = int(os.environ.get('PURE_PYTHON', '0'))
 if PURE_PYTHON:
@@ -71,8 +72,11 @@ def rolesForPermissionOn(perm, object, default=_default_roles, n=None):
     r = None
 
     while True:
-        if hasattr(object, n):
+        try:
             roles = getattr(object, n)
+        except (AttributeError, zExceptions_Unauthorized):
+            pass
+        else:
             if roles is None:
                 if _embed_permission_in_roles:
                     return (('Anonymous',), n)

{AccessControl-6.3 → accesscontrol-7.1}/src/AccessControl/SecurityInfo.py

@@ -78,7 +78,8 @@ class SecurityInfo(Implicit):
     def _setaccess(self, names, access):
         for name in names:
             if self.names.get(name, access) != access:
-                LOG.warn('Conflicting security declarations for "%s"' % name)
+                LOG.warning(
+                    f'Conflicting security declarations for {name!r}')
                 self._warnings = 1
             self.names[name] = access
 
@@ -139,7 +140,7 @@ class SecurityInfo(Implicit):
         # the decorator returned is remembered in a set and will
         # remove itself upon call. self.apply will check for an empty
         # set and raise an AssertionError otherwise.
-        key = "'{}':{}".format(permission_name, id(lambda x: x))
+        key = f"'{permission_name}':{id(lambda x: x)}"
 
         def decor(func):
             self.declareProtected(permission_name, func.__name__)  # NOQA: D001
@@ -147,7 +148,7 @@ class SecurityInfo(Implicit):
             return func
         # make sure our key algo creates unique-enough keys
         if key in self._unused_protected_decorators:
-            raise KeyError("Duplicate key: {}".format(key))
+            raise KeyError(f"Duplicate key: {key}")
         self._unused_protected_decorators.add(key)
         return decor
 
@@ -159,8 +160,8 @@ class SecurityInfo(Implicit):
         for role in roles:
             rdict[role] = 1
         if self.roles.get(permission_name, rdict) != rdict:
-            LOG.warn('Conflicting default role'
-                     'declarations for permission "%s"' % permission_name)
+            LOG.warning('Conflicting default role'
+                        ' declarations for permission "%s"' % permission_name)
             self._warnings = 1
         self.roles[permission_name] = rdict
 
@@ -248,8 +249,8 @@ class ClassSecurityInfo(SecurityInfo):
                     access)
 
         if getattr(self, '_warnings', None):
-            LOG.warn('Class "%s" had conflicting '
-                     'security declarations' % classobj.__name__)
+            LOG.warning('Class "%s" had conflicting'
+                        ' security declarations' % classobj.__name__)
 
 
 class ClassSecurityInformation(ClassSecurityInfo):
@@ -343,8 +344,8 @@ class _ModuleSecurityInfo(SecurityInfo):
             dict['__allow_access_to_unprotected_subobjects__'] = self
 
         if getattr(self, '_warnings', None):
-            LOG.warn('Module "%s" had conflicting '
-                     'security declarations' % dict['__name__'])
+            LOG.warning('Module "%s" had conflicting'
+                        ' security declarations' % dict['__name__'])
 
     declareProtected__roles__ = ACCESS_PRIVATE
 

{AccessControl-6.3 → accesscontrol-7.1}/src/AccessControl/ZopeGuards.py

@@ -12,6 +12,7 @@
 ##############################################################################
 
 
+import collections.abc
 import math
 import random
 import string
@@ -127,13 +128,18 @@ def get_dict_pop(d, name):
     return guarded_pop
 
 
-def get_iter(c, name):
-    iter = getattr(c, name)
+def get_mapping_view(c, name):
 
-    def guarded_iter():
-        return SafeIter(iter(), c)
+    view_class = {
+        'keys': SafeKeysView,
+        'items': SafeItemsView,
+        'values': SafeValuesView,
+    }
 
-    return guarded_iter
+    def guarded_mapping_view():
+        return view_class[name](c)
+
+    return guarded_mapping_view
 
 
 def get_list_pop(lst, name):
@@ -153,18 +159,15 @@ _dict_white_list = {
     'copy': 1,
     'fromkeys': 1,
     'get': get_dict_get,
-    'items': 1,
+    'items': get_mapping_view,
+    'keys': get_mapping_view,
     'pop': get_dict_pop,
     'popitem': 1,
     'setdefault': 1,
     'update': 1,
+    'values': get_mapping_view,
 }
 
-_dict_white_list.update({
-    'keys': get_iter,
-    'values': get_iter,
-})
-
 
 def _check_dict_access(name, value):
     # Check whether value is a dict method
@@ -272,6 +275,40 @@ class NullIter(SafeIter):
     next = __next__
 
 
+# The following three view classes are used only for mappings of type `dict`
+# (not subclasses). Therefore, the mapping does not have security assertions
+# and cannot acquire ones. As a consequence, the `guard` calls used in their
+# methods verify that the checked key or value is accessible based solely on
+# its own virtues, i.e. either because it is public or has its own security
+# assertions allowing access.
+class _SafeMappingView:
+    __allow_access_to_unprotected_subobjects__ = 1
+
+    def __iter__(self):
+        for e in super().__iter__():
+            guard(self._mapping, e)
+            yield e
+
+
+class SafeKeysView(_SafeMappingView, collections.abc.KeysView):
+    pass
+
+
+class SafeValuesView(_SafeMappingView, collections.abc.ValuesView):
+    pass
+
+
+class SafeItemsView(_SafeMappingView, collections.abc.ItemsView):
+    def __iter__(self):
+        for k, v in super().__iter__():
+            guard(self._mapping, k)
+            # When checking the value, we check the guard with index=None,
+            # not with index=k, the key name does not matter. guard just
+            # needs to verify that the value itself can be accessed.
+            guard(self._mapping, v)
+            yield k, v
+
+
 def _error(index):
     raise Unauthorized('unauthorized access to element')
 
@@ -454,7 +491,7 @@ def load_module(module, mname, mnameparts, validate, globals, locals):
         if mname is None:
             mname = nextname
         else:
-            mname = '{}.{}'.format(mname, nextname)
+            mname = f'{mname}.{nextname}'
         # import (if not already imported) and  check for MSI
         nextmodule = secureModule(mname, globals, locals)
         if nextmodule is None:  # not allowed

{AccessControl-6.3 → accesscontrol-7.1}/src/AccessControl/cAccessControl.c

@@ -425,7 +425,7 @@ static PyExtensionClass ZopeSecurityPolicyType = {
 	0,					/* tp_itemsize	*/
 	/* Standard methods 	*/
 	(destructor) ZopeSecurityPolicy_dealloc,/* tp_dealloc	*/
-	NULL,					/* tp_print	*/
+	0,  					/* tp_vectorcall_offset	*/
 	NULL,					/* tp_getattr	*/
 	NULL,					/* tp_setattr	*/
 	NULL,					/* tp_compare	*/
@@ -484,7 +484,7 @@ static PyExtensionClass SecurityManagerType = {
 	0,					/* tp_itemsize	*/
 	/* Standard methods 	*/
 	(destructor) SecurityManager_dealloc,/* tp_dealloc	*/
-	NULL,					/* tp_print	*/
+	0,  					/* tp_vectorcall_offset*/
 	NULL,					/* tp_getattr	*/
 	NULL,					/* tp_setattr	*/
 	NULL,					/* tp_compare	*/
@@ -543,7 +543,7 @@ static PyExtensionClass PermissionRoleType = {
 	0,					/* tp_itemsize	*/
 	/* Standard methods 	*/
 	(destructor) PermissionRole_dealloc,	/* tp_dealloc	*/
-	NULL,					/* tp_print	*/
+	0,  					/* tp_vectorcall_offset	*/
 	NULL,					/* tp_getattr	*/
 	NULL,					/* tp_setattr	*/
 	NULL,					/* tp_compare	*/
@@ -613,7 +613,7 @@ static PyExtensionClass imPermissionRoleType = {
 	0,					/* tp_itemsize	*/
 	/* Standard methods 	*/
 	(destructor) imPermissionRole_dealloc,	/* tp_dealloc	*/
-	NULL,					/* tp_print	*/
+	0,  					/* tp_vectorcall_offset	*/
 	NULL,					/* tp_getattr	*/
 	NULL,	                                /* tp_setattr	*/
 	NULL,					/* tp_compare	*/
@@ -652,6 +652,7 @@ static PyExtensionClass imPermissionRoleType = {
 static PyObject *Containers = NULL;
 static PyObject *ContainerAssertions = NULL;
 static PyObject *Unauthorized = NULL;
+static PyObject *zExceptions_Unauthorized = NULL;
 static PyObject *warn= NULL;
 static PyObject *NoSequenceFormat = NULL;
 static PyObject *_what_not_even_god_should_do = NULL;
@@ -1071,7 +1072,7 @@ static PyObject *ZopeSecurityPolicy_validate(PyObject *self, PyObject *args) {
 	**| try:
 	**|    if roles is None or 'Anonymous' in roles: return 1
 	**| except TypeError:
-	**|     LOG.warn('"%s' passed as roles"
+	**|     LOG.warning('"%s' passed as roles"
 	**|		" during validation of '%s' is not a sequence." %
 	**|		('roles', name))
 	**|	raise
@@ -1847,15 +1848,27 @@ c_rolesForPermissionOn(PyObject *perm, PyObject *object,
   Py_INCREF(r);
 
   /*
-    while 1:
+    while True:
   */
   while (1)
     {
       /*
-        if hasattr(object, n):
+        try:
             roles = getattr(object, n)
+        except (AttributeError, zExceptions_Unauthorized):
+            pass
+        else:
       */
       PyObject *roles = PyObject_GetAttr(object, n);
+      if (roles == NULL)
+        {
+          if (! (PyErr_ExceptionMatches(PyExc_AttributeError)
+              || PyErr_ExceptionMatches(zExceptions_Unauthorized)))
+            {
+              /* re-raise */
+              return NULL;
+            }
+        }
       if (roles != NULL)
         {
 
@@ -2313,6 +2326,7 @@ static struct PyMethodDef dtml_methods[] = {
 */
 #define IMPORT(module, name) if ((module = PyImport_ImportModule(name)) == NULL) return NULL;
 #define GETATTR(module, name) if ((name = PyObject_GetAttrString(module, #name)) == NULL) return NULL;
+#define GETATTR_AS(module, name, as_name) if ((as_name = PyObject_GetAttrString(module, name)) == NULL) return NULL;
 
 static struct PyModuleDef moduledef =
 {
@@ -2400,6 +2414,14 @@ module_init(void) {
 	Py_DECREF(tmp);
 	tmp = NULL;
 
+	/*| from zExceptions import Unauthorized as zExceptions_Unauthorized
+	*/
+
+	IMPORT(tmp, "zExceptions");
+	GETATTR_AS(tmp, "Unauthorized", zExceptions_Unauthorized);
+	Py_DECREF(tmp);
+	tmp = NULL;
+
 	/*| from AccessControl.SecurityManagement import getSecurityManager
 	*/
 

{AccessControl-6.3 → accesscontrol-7.1}/src/AccessControl/logger_wrapper.py

@@ -5,4 +5,4 @@ from logging import getLogger
 
 
 LOG = getLogger('AccessControl')
-warn = LOG.warn
+warn = LOG.warning

{AccessControl-6.3 → accesscontrol-7.1}/src/AccessControl/tests/actual_python.py

@@ -123,6 +123,39 @@ def f7():
         access = getattr(d, meth)
         result = sorted(access())
         assert result == expected[kind], (meth, kind, result, expected[kind])
+        assert len(access()) == len(expected[kind]), (meth, kind, "len")
+        iter_ = access()  # iterate twice on the same view
+        assert list(iter_) == list(iter_)
+
+        assert sorted([k for k in getattr(d, meth)()]) == expected[kind]
+        assert sorted(k for k in getattr(d, meth)()) == expected[kind]
+    assert {k: v for k, v in d.items()} == d
+
+    assert 1 in d
+    assert 1 in d.keys()
+    assert 2 in d.values()
+    assert (1, 2) in d.items()
+
+    assert d
+    assert d.keys()
+    assert d.values()
+    assert d.items()
+
+    empty_d = {}
+    assert not empty_d
+    assert not empty_d.keys()
+    assert not empty_d.values()
+    assert not empty_d.items()
+
+    smaller_d = {1: 2}
+    for m, _ in methods:
+        assert getattr(d, m)() != getattr(smaller_d, m)()
+        assert not getattr(d, m)() == getattr(smaller_d, m)()
+        if m != 'values':
+            assert getattr(d, m)() > getattr(smaller_d, m)()
+            assert getattr(d, m)() >= getattr(smaller_d, m)()
+            assert getattr(smaller_d, m)() < getattr(d, m)()
+            assert getattr(smaller_d, m)() <= getattr(d, m)()
 
 
 f7()

{AccessControl-6.3 → accesscontrol-7.1}/src/AccessControl/tests/testClassSecurityInfo.py

@@ -102,10 +102,10 @@ class ClassSecurityInfoTests(unittest.TestCase):
         self.assertEqual(object.private__roles__, ())
         imPermissionRole = [r for r in object.protected__roles__
                             if not r.endswith('_Permission')]
-        self.assertTrue(len(imPermissionRole) == 4)
+        self.assertEqual(len(imPermissionRole), 4)
 
         for item in ('Manager', 'Role A', 'Role B', 'Role C'):
-            self.assertTrue(item in imPermissionRole)
+            self.assertIn(item, imPermissionRole)
 
         # functions exist, i.e. decorators returned them
         self.assertEqual(object.public_new.__name__, 'public_new')
@@ -117,10 +117,10 @@ class ClassSecurityInfoTests(unittest.TestCase):
         self.assertEqual(object.private_new__roles__, ())
         imPermissionRole = [r for r in object.protected_new__roles__
                             if not r.endswith('_Permission')]
-        self.assertTrue(len(imPermissionRole) == 4)
+        self.assertEqual(len(imPermissionRole), 4)
 
         for item in ('Manager', 'Role A', 'Role B', 'Role C'):
-            self.assertTrue(item in imPermissionRole)
+            self.assertIn(item, imPermissionRole)
 
         # Make sure that a permission defined without accompanying method
         # is still reflected in __ac_permissions__
@@ -160,7 +160,7 @@ class ClassSecurityInfoTests(unittest.TestCase):
         # Do class initialization.
         exc = self.assertRaises(AssertionError,
                                 InitializeClass, Test)
-        self.assertTrue('has 2 non-decorator' in str(exc))
+        self.assertIn('has 2 non-decorator', str(exc))
 
     def test_aq_context_in_decorators(self):
         from Acquisition import Implicit

{AccessControl-6.3 → accesscontrol-7.1}/src/AccessControl/tests/testModuleSecurity.py

@@ -98,12 +98,12 @@ class ModuleSecurityTests(unittest.TestCase):
         from AccessControl.SecurityInfo import _moduleSecurity as MS
         from AccessControl.ZopeGuards import guarded_import
         MSI('AccessControl.tests.nonesuch').declarePublic('pub')  # NOQA: D001
-        self.assertTrue('AccessControl.tests.nonesuch' in MS)
+        self.assertIn('AccessControl.tests.nonesuch', MS)
         self.assertRaises(ImportError,
                           guarded_import,
                           'AccessControl.tests.nonesuch',
                           ())
-        self.assertTrue('AccessControl.tests.nonesuch' in MS)
+        self.assertIn('AccessControl.tests.nonesuch', MS)
 
     def test_level_default(self):
         self.assertAuth('AccessControl.tests.public_module', (),