[Zope-CVS] CVS: Products/PluggableAuthService/plugins - DynamicGroupsPlugin.py:1.3.8.3 ZODBUserManager.py:1.6.4.4

[Jens Vagelpohl]

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

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


=== Products/PluggableAuthService/plugins/DynamicGroupsPlugin.py 1.3.8.2 => 1.3.8.3 ===
--- Products/PluggableAuthService/plugins/DynamicGroupsPlugin.py:1.3.8.2	Wed Oct 27 02:45:47 2004
+++ Products/PluggableAuthService/plugins/DynamicGroupsPlugin.py	Mon Nov  8 02:13:38 2004
@@ -23,6 +23,7 @@
 from OFS.SimpleItem import SimpleItem
 from OFS.PropertyManager import PropertyManager
 from OFS.Folder import Folder
+from OFS.Cache import Cacheable
 from Globals import InitializeClass
 from Persistence import PersistentMapping
 
@@ -39,7 +40,6 @@
 
 from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
 
-from Products.PluggableAuthService.PASCache import PASCacheable
 from Products.PluggableAuthService.utils import createViewName
 
 
@@ -60,7 +60,7 @@
                            )
                          )
 
-class DynamicGroupDefinition( SimpleItem, PropertyManager, PASCacheable ):
+class DynamicGroupDefinition( SimpleItem, PropertyManager, Cacheable ):
 
     """ Represent a single dynamic group.
     """
@@ -162,7 +162,7 @@
 InitializeClass( DynamicGroupDefinition )
 
 
-class DynamicGroupsPlugin( Folder, BasePlugin, PASCacheable ):
+class DynamicGroupsPlugin( Folder, BasePlugin, Cacheable ):
 
     """ Define groups via business rules.
 


=== Products/PluggableAuthService/plugins/ZODBUserManager.py 1.6.4.3 => 1.6.4.4 ===
--- Products/PluggableAuthService/plugins/ZODBUserManager.py:1.6.4.3	Sat Nov  6 06:48:31 2004
+++ Products/PluggableAuthService/plugins/ZODBUserManager.py	Mon Nov  8 02:13:38 2004
@@ -23,10 +23,10 @@
 from AccessControl.SecurityManagement import getSecurityManager
 from App.class_init import default__class_init__ as InitializeClass
 from BTrees.OOBTree import OOBTree
+from OFS.Cache import Cacheable
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
 from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
-from Products.PluggableAuthService.PASCache import PASCacheable
 from Products.PluggableAuthService.utils import createViewName
 from Products.PluggableAuthService.interfaces.plugins \
     import IAuthenticationPlugin
@@ -55,7 +55,7 @@
                                 'ZODBUserManager+added.'
                             % dispatcher.absolute_url())
 
-class ZODBUserManager( BasePlugin, PASCacheable ):
+class ZODBUserManager( BasePlugin, Cacheable ):
 
     """ PAS plugin for managing users in the ZODB.
     """
@@ -311,7 +311,7 @@
                          ,
                        )
                      + BasePlugin.manage_options
-                     + PASCacheable.manage_options
+                     + Cacheable.manage_options
                      )
 
     security.declarePublic( 'manage_widgets' )