Merged getOwner optimizations from 2.4 branch

lib/python/AccessControl/Owned.py

@@ -85,8 +85,8 @@
 __doc__='''Support for owned objects
 
 
-$Id: Owned.py,v 1.11 2001/04/27 20:27:37 shane Exp $'''
-__version__='$Revision: 1.11 $'[11:-2]
+$Id: Owned.py,v 1.12 2001/07/02 16:29:55 evan Exp $'''
+__version__='$Revision: 1.12 $'[11:-2]
 
 import Globals, urlparse, SpecialUsers, ExtensionClass, string
 from AccessControl import getSecurityManager, Unauthorized
@@ -135,7 +135,9 @@ class Owned(ExtensionClass.Base):
     
     getOwner__roles__=()
     def getOwner(self, info=0,
-                 aq_get=aq_get, None=None, UnownableOwner=UnownableOwner,
+                 aq_get=aq_get, None=None,
+                 UnownableOwner=UnownableOwner,
+                 getSecurityManager=getSecurityManager,
                  ):
         """Get the owner
 
@@ -143,19 +145,25 @@ class Owned(ExtensionClass.Base):
         returned. Otherwise, the owner object is returned.
         """
         owner=aq_get(self, '_owner', None, 1)
-        if owner is None: return owner
-
-        if info: return owner
+        if info or (owner is None): return owner
 
         if owner is UnownableOwner: return None
 
         udb, oid = owner
+        upath = ('',) + tuple(udb) + (oid,)
+        objectCache = getSecurityManager()._context.objectCache
+        if objectCache.has_key(upath):
+            return objectCache[upath]
+
         root=self.getPhysicalRoot()
         udb=root.unrestrictedTraverse(udb, None)
-        if udb is None: return SpecialUsers.nobody
-        owner = udb.getUserById(oid, None)
-        if owner is None: return SpecialUsers.nobody
-        return owner
+        if udb is None:
+            user = SpecialUsers.nobody
+        else:
+            user = udb.getUserById(oid, None)
+            if user is None: user = SpecialUsers.nobody
+        objectCache[upath] = user
+        return user
 
     changeOwnership__roles__=()
     def changeOwnership(self, user, recursive=0,

lib/python/AccessControl/SecurityManagement.py

@@ -85,8 +85,8 @@
 __doc__='''short description
 
 
-$Id: SecurityManagement.py,v 1.3 2000/11/10 17:04:14 brian Exp $'''
-__version__='$Revision: 1.3 $'[11:-2]
+$Id: SecurityManagement.py,v 1.4 2001/07/02 16:29:55 evan Exp $'''
+__version__='$Revision: 1.4 $'[11:-2]
 
 import SpecialUsers
 from SecurityManager import SecurityManager
@@ -139,6 +139,6 @@ class SecurityContext:
     def __init__(self, user):
         self.stack=[]
         self.user=user
-
+        self.objectCache = {}
 
     

lib/python/AccessControl/SecurityManager.py

@@ -85,8 +85,8 @@
 __doc__='''short description
 
 
-$Id: SecurityManager.py,v 1.4 2001/04/11 17:53:22 evan Exp $'''
-__version__='$Revision: 1.4 $'[11:-2]
+$Id: SecurityManager.py,v 1.5 2001/07/02 16:29:55 evan Exp $'''
+__version__='$Revision: 1.5 $'[11:-2]
 
 import ZopeSecurityPolicy, os, string
 
@@ -214,7 +214,7 @@ class SecurityManager:
             self._policy=None
 
     def getUser(self):
-        """Gen the current authenticated user"""
+        """Get the current authenticated user"""
         return self._context.user
 
     def calledByExecutable(self):