Merge from branch.

lib/python/Products/Sessions/BrowserIdManager.py

@@ -11,7 +11,7 @@
 #
 ############################################################################
 
-__version__='$Revision: 1.8 $'[11:-2]
+__version__='$Revision: 1.9 $'[11:-2]
 import Globals
 from Persistence import Persistent
 from ZODB import TimeStamp
@@ -68,16 +68,17 @@ class BrowserIdManager(Item, Persistent, Implicit, RoleManager, Owned, Tabs):
         {'label': 'Ownership', 'action':'manage_owner'}
         )
 
+    __implements__ = (SessionInterfaces.BrowserIdManagerInterface, )
+
+    icon = 'misc_/Sessions/idmgr.gif'
+
     security = ClassSecurityInfo()
-    security.setDefaultAccess('deny')
+    ok = {'meta_type':1, 'id':1, 'icon':1, 'bobobase_modification_time':1 }
+    security.setDefaultAccess(ok)
     security.setPermissionDefault(MGMT_SCREEN_PERM, ['Manager'])
     security.setPermissionDefault(ACCESS_CONTENTS_PERM,['Manager','Anonymous'])
     security.setPermissionDefault(CHANGE_IDMGR_PERM, ['Manager'])
 
-    __implements__ = (SessionInterfaces.BrowserIdManagerInterface, )
-
-    icon = 'misc_/Sessions/idmgr.gif'
-
     def __init__(self, id, title='', idname='_ZopeId',
                  location='cookiesthenform', cookiepath=('/'),
                  cookiedomain='', cookielifedays=0, cookiesecure=0):

lib/python/Products/Sessions/SessionDataManager.py

@@ -65,7 +65,8 @@ class SessionDataManager(Item, Implicit, Persistent, RoleManager, Owned, Tabs):
 
     security = ClassSecurityInfo()
 
-    security.setDefaultAccess('deny')
+    ok = {'meta_type':1, 'id':1, 'icon':1, 'bobobase_modification_time':1 }
+    security.setDefaultAccess(ok)
     security.setPermissionDefault(CHANGE_DATAMGR_PERM, ['Manager'])
     security.setPermissionDefault(MGMT_SCREEN_PERM, ['Manager'])
     security.setPermissionDefault(ACCESS_CONTENTS_PERM,['Manager','Anonymous'])

lib/python/Products/TemporaryFolder/TemporaryStorage.py

@@ -17,10 +17,10 @@ MappingStorage.  Unlike MappingStorage, it needs not be packed to get rid of
 non-cyclic garbage and it does rudimentary conflict resolution.  This is a
 ripoff of Jim's Packless bsddb3 storage.
 
-$Id: TemporaryStorage.py,v 1.6 2001/11/28 15:51:08 matt Exp $
+$Id: TemporaryStorage.py,v 1.7 2002/01/11 14:53:38 chrism Exp $
 """
 
-__version__ ='$Revision: 1.6 $'[11:-2]
+__version__ ='$Revision: 1.7 $'[11:-2]
 
 from zLOG import LOG
 from ZODB.referencesf import referencesf
@@ -103,10 +103,11 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage):
         storage needs! """
         self._lock_acquire()
         try:
-            data, t = self._conflict_cache.get((oid, serial), marker)
+            data = self._conflict_cache.get((oid, serial), marker)
             if data is marker:
                 raise POSException.ConflictError, (oid, serial)
-            return data
+            else:
+                return data[0] # data here is actually (data, t)
         finally:
             self._lock_release()
             

lib/python/Products/TemporaryFolder/__init__.py

@@ -13,13 +13,13 @@
 """
 Temporary Folder initialization routines
 
-$Id: __init__.py,v 1.4 2001/11/28 15:51:08 matt Exp $
+$Id: __init__.py,v 1.5 2002/01/11 14:53:38 chrism Exp $
 """
 
 import ZODB # for testrunner to be happy
-import TemporaryFolder
 
 def initialize(context):
+    import TemporaryFolder
     context.registerClass(
         TemporaryFolder.MountedTemporaryFolder,
         permission=TemporaryFolder.ADD_TEMPORARY_FOLDER_PERM,

lib/python/Products/Transience/Transience.py

@@ -13,10 +13,10 @@
 """
 Transient Object Container class.
 
-$Id: Transience.py,v 1.23 2001/11/28 15:51:08 matt Exp $
+$Id: Transience.py,v 1.24 2002/01/11 14:55:22 chrism Exp $
 """
 
-__version__='$Revision: 1.23 $'[11:-2]
+__version__='$Revision: 1.24 $'[11:-2]
 
 import Globals
 from Globals import HTMLFile
@@ -87,8 +87,8 @@ class TransientObjectContainer(SimpleItem):
     )
 
     security = ClassSecurityInfo()
-    security.setDefaultAccess('deny')
-
+    ok = {'meta_type':1, 'id':1, 'icon':1, 'bobobase_modification_time':1 }
+    security.setDefaultAccess(ok)
     security.setPermissionDefault(ACCESS_TRANSIENTS_PERM,
                                 ['Manager','Anonymous'])
     security.setPermissionDefault(MANAGE_CONTAINER_PERM,['Manager',])