[Zope3-checkins] CVS: Zope3/src/zope/app/catalog - catalog.py:1.10.6.2

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/catalog
In directory cvs.zope.org:/tmp/cvs-serv13470/src/zope/app/catalog

Modified Files:
      Tag: parentgeddon-branch
	catalog.py 
Log Message:
Can't have the tests passing, can we?

=== Zope3/src/zope/app/catalog/catalog.py 1.10.6.1 => 1.10.6.2 ===
--- Zope3/src/zope/app/catalog/catalog.py:1.10.6.1	Mon Sep  8 14:21:33 2003
+++ Zope3/src/zope/app/catalog/catalog.py	Fri Sep 12 15:15:19 2003
@@ -11,7 +11,7 @@
 from zope.app.interfaces.services.utility import ILocalUtility
 from zope.security.proxy import trustedRemoveSecurityProxy
 
-from zope.app.interfaces.container import IDeleteNotifiable, IAddNotifiable
+from zope.app.interfaces.container import IRemoveNotifiable, IAddNotifiable
 from zope.app.interfaces.container import IContainer
 from zope.index.interfaces import ISimpleQuery
 
@@ -41,7 +41,7 @@
 
 class CatalogBase(Persistent, SampleContainer):
 
-    implements(ICatalog, ISubscriber, IDeleteNotifiable, 
+    implements(ICatalog, ISubscriber, IRemoveNotifiable, 
                IAddNotifiable, IContainer, IAttributeAnnotatable)
 
     _subscribed = False
@@ -52,10 +52,10 @@
     def getSubscribed(self): 
         return self._subscribed
 
-    def afterAddHook(self, object, container):
+    def addNotify(self, event):
         self.subscribeEvents(update=False)
 
-    def beforeDeleteHook(self, object, container):
+    def removeNotify(self, event):
         " be nice, unsub ourselves in this case "
         if self._subscribed:
             self.unsubscribeEvents()