[CMF-checkins] CVS: CMF/CMFCore - ActionInformation.py:1.19 Expression.py:1.8

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv2839/CMFCore

Modified Files:
	ActionInformation.py Expression.py 
Log Message:
use a better cache key


=== CMF/CMFCore/ActionInformation.py 1.18 => 1.19 ===
--- CMF/CMFCore/ActionInformation.py:1.18	Thu Nov 27 10:06:49 2003
+++ CMF/CMFCore/ActionInformation.py	Tue Dec  2 12:06:14 2003
@@ -201,7 +201,7 @@
         cache = request.get('_oai_cache', None)
         if cache is None:
             request['_oai_cache'] = cache = {}
-        info = cache.get( str(object), None )
+        info = cache.get( id(object), None )
     else:
         info = None
     if info is None:
@@ -219,7 +219,7 @@
                     folder = aq_parent(aq_inner(folder))
         info = oai(context, folder, object)
         if request:
-            cache[ str(object) ] = info
+            cache[ id(object) ] = info
     return info
 
 


=== CMF/CMFCore/Expression.py 1.7 => 1.8 ===
--- CMF/CMFCore/Expression.py:1.7	Mon Dec  1 08:55:42 2003
+++ CMF/CMFCore/Expression.py	Tue Dec  2 12:06:14 2003
@@ -56,7 +56,7 @@
         cache = request.get('_ec_cache', None)
         if cache is None:
             request['_ec_cache'] = cache = {}
-        ec = cache.get( str(object), None )
+        ec = cache.get( id(object), None )
     else:
         ec = None
     if ec is None:
@@ -76,7 +76,7 @@
                     folder = aq_parent(aq_inner(folder))
         ec = createExprContext(folder, portal, object)
         if request:
-            cache[ str(object) ] = ec
+            cache[ id(object) ] = ec
     return ec