[Zope-CVS] CVS: Products/PluggableAuthService - PASCache.py:1.1.2.2 PluggableAuthService.py:1.19.2.6

[Jens Vagelpohl]

Update of /cvs-repository/Products/PluggableAuthService
In directory cvs.zope.org:/tmp/cvs-serv5213

Modified Files:
      Tag: jens-implement_caching_branch
	PASCache.py PluggableAuthService.py 
Log Message:
- remove the (empty) PASCacheable class and replace it with 
  OFS.Cache.Cacheable everywhere


=== Products/PluggableAuthService/PASCache.py 1.1.2.1 => 1.1.2.2 ===
--- Products/PluggableAuthService/PASCache.py:1.1.2.1	Tue Oct 19 07:44:39 2004
+++ Products/PluggableAuthService/PASCache.py	Mon Nov  8 02:13:38 2004
@@ -12,24 +12,16 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-""" Classes: PASCacheable, PASRAMCacheManager
+""" Classes: PASRAMCacheManager
 
 $Id$
 """
 
 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
-from OFS.Cache import Cacheable
 from AccessControl.Permissions import manage_users
 from Products.StandardCacheManagers.RAMCacheManager import RAMCacheManager
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-
-class PASCacheable(Cacheable):
-
-    security = ClassSecurityInfo()
-
-
-InitializeClass(PASCacheable)
 
 
 manage_addPASRAMCacheManagerForm = PageTemplateFile(


=== Products/PluggableAuthService/PluggableAuthService.py 1.19.2.5 => 1.19.2.6 ===
--- Products/PluggableAuthService/PluggableAuthService.py:1.19.2.5	Sat Nov  6 07:15:59 2004
+++ Products/PluggableAuthService/PluggableAuthService.py	Mon Nov  8 02:13:38 2004
@@ -37,6 +37,7 @@
 from zExceptions import Unauthorized
 from Persistence import PersistentMapping
 from OFS.Folder import Folder
+from OFS.Cache import Cacheable
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from ZTUtils import Batch
 from App.class_init import default__class_init__ as InitializeClass
@@ -68,7 +69,6 @@
 
 from PropertiedUser import PropertiedUser
 from PASCache import PASRAMCacheManager
-from PASCache import PASCacheable
 from utils import _wwwdir
 from utils import createViewName
 
@@ -155,7 +155,7 @@
 InitializeClass( EmergencyUserAuthenticator )
 
 
-class PluggableAuthService( Folder, PASCacheable ):
+class PluggableAuthService( Folder, Cacheable ):
 
     """ All-singing, all-dancing user folder.
     """
@@ -557,7 +557,7 @@
                         ,
                         )
                       + Folder.manage_options[2:]
-                      + PASCacheable.manage_options
+                      + Cacheable.manage_options
                       )
 
     security.declareProtected(ManageUsers, 'resultsBatch')