Log message for revision 113638: Avoid the Base* prefix, now that the class is in a different module
Changed: U Zope/trunk/src/AccessControl/AccessControl.txt U Zope/trunk/src/AccessControl/Role.py U Zope/trunk/src/AccessControl/rolemanager.py U Zope/trunk/src/AccessControl/tests/testRole.py U Zope/trunk/src/OFS/role.py -=- Modified: Zope/trunk/src/AccessControl/AccessControl.txt =================================================================== --- Zope/trunk/src/AccessControl/AccessControl.txt 2010-06-19 12:22:23 UTC (rev 113637) +++ Zope/trunk/src/AccessControl/AccessControl.txt 2010-06-19 12:29:54 UTC (rev 113638) @@ -166,7 +166,7 @@ To support the architecture, developers must derive an -object from the AccessControl.rolemanager.BaseRoleManager mixin class, +object from the AccessControl.rolemanager.RoleManager mixin class, and define in their class an __ac_permissions__ attribute. This should be a tuple of tuples, where each tuple represents Modified: Zope/trunk/src/AccessControl/Role.py =================================================================== --- Zope/trunk/src/AccessControl/Role.py 2010-06-19 12:22:23 UTC (rev 113637) +++ Zope/trunk/src/AccessControl/Role.py 2010-06-19 12:29:54 UTC (rev 113638) @@ -17,7 +17,6 @@ from .rolemanager import DEFAULTMAXLISTUSERS from .rolemanager import _isBeingUsedAsAMethod from .rolemanager import _isNotBeingUsedAsAMethod -from .rolemanager import BaseRoleManager from .rolemanager import reqattr from .rolemanager import classattr from .rolemanager import instance_dict @@ -29,6 +28,6 @@ from zope.deferredimport import deprecated deprecated("RoleManager is no longer part of AccessControl, please " "depend on Zope2 and import from OFS.role or use the " - "BaseRoleManager class from AccessControl.rolemanager.", + "RoleManager class from AccessControl.rolemanager.", RoleManager = 'OFS.role:RoleManager', ) Modified: Zope/trunk/src/AccessControl/rolemanager.py =================================================================== --- Zope/trunk/src/AccessControl/rolemanager.py 2010-06-19 12:22:23 UTC (rev 113637) +++ Zope/trunk/src/AccessControl/rolemanager.py 2010-06-19 12:29:54 UTC (rev 113638) @@ -40,7 +40,7 @@ return not aq_get(self, '_isBeingUsedAsAMethod_', 0) -class BaseRoleManager(Base, RoleManager): +class RoleManager(Base, RoleManager): """An object that has configurable permissions""" implements(IRoleManager) @@ -436,7 +436,7 @@ d.sort() return d -InitializeClass(BaseRoleManager) +InitializeClass(RoleManager) def reqattr(request, attr): Modified: Zope/trunk/src/AccessControl/tests/testRole.py =================================================================== --- Zope/trunk/src/AccessControl/tests/testRole.py 2010-06-19 12:22:23 UTC (rev 113637) +++ Zope/trunk/src/AccessControl/tests/testRole.py 2010-06-19 12:29:54 UTC (rev 113638) @@ -5,10 +5,10 @@ def test_interfaces(self): from AccessControl.interfaces import IRoleManager - from AccessControl.rolemanager import BaseRoleManager + from AccessControl.rolemanager import RoleManager from zope.interface.verify import verifyClass - verifyClass(IRoleManager, BaseRoleManager) + verifyClass(IRoleManager, RoleManager) def test_suite(): Modified: Zope/trunk/src/OFS/role.py =================================================================== --- Zope/trunk/src/OFS/role.py 2010-06-19 12:22:23 UTC (rev 113637) +++ Zope/trunk/src/OFS/role.py 2010-06-19 12:29:54 UTC (rev 113638) @@ -19,7 +19,7 @@ from AccessControl import ClassSecurityInfo from AccessControl.class_init import InitializeClass -from AccessControl.rolemanager import BaseRoleManager +from AccessControl.rolemanager import RoleManager as BaseRoleManager from AccessControl.rolemanager import reqattr from AccessControl.Permission import Permission from AccessControl.Permissions import change_permissions _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins