[Zope-Checkins] CVS: Zope/lib/python/AccessControl - Role.py:1.57.8.1 User.py:1.179.16.1

[Jim Fulton]

Update of /cvs-repository/Zope/lib/python/AccessControl
In directory cvs.zope.org:/tmp/cvs-serv26022/lib/python/AccessControl

Modified Files:
      Tag: mro-advanture-branch
	Role.py User.py 
Log Message:
Changed various modules to fix mro problems when using the C3
method-lookup algorithm.


=== Zope/lib/python/AccessControl/Role.py 1.57 => 1.57.8.1 ===
--- Zope/lib/python/AccessControl/Role.py:1.57	Sun Aug 17 13:51:32 2003
+++ Zope/lib/python/AccessControl/Role.py	Fri Oct 31 14:24:15 2003
@@ -32,7 +32,7 @@
 def _isNotBeingUsedAsAMethod(self):
     return not aq_get(self, '_isBeingUsedAsAMethod_', 0)
 
-class RoleManager(ExtensionClass.Base, PermissionMapping.RoleManager):
+class RoleManager(PermissionMapping.RoleManager, ExtensionClass.Base):
     """An object that has configurable permissions"""
 
     __ac_permissions__=(


=== Zope/lib/python/AccessControl/User.py 1.179 => 1.179.16.1 ===
--- Zope/lib/python/AccessControl/User.py:1.179	Sat Jul 26 17:58:18 2003
+++ Zope/lib/python/AccessControl/User.py	Fri Oct 31 14:24:15 2003
@@ -438,7 +438,7 @@
 SpecialUsers.super=emergency_user
 
 
-class BasicUserFolder(Implicit, Persistent, Navigation, Tabs, RoleManager,
+class BasicUserFolder(Implicit, Persistent, Navigation, RoleManager,
                       Item):
     """Base class for UserFolder-like objects"""