[Zope3-checkins] CVS: Zope3/src/zope/app/wiki - configure.zcml:1.5 wikipage.py:1.3

[Philipp von Weitershausen]

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

Modified Files:
	configure.zcml wikipage.py 
Log Message:
Moved event interfaces from zope.app.interfaces.event to
zope.app.event.interfaces.


=== Zope3/src/zope/app/wiki/configure.zcml 1.4 => 1.5 ===
--- Zope3/src/zope/app/wiki/configure.zcml:1.4	Tue Mar  2 13:16:16 2004
+++ Zope3/src/zope/app/wiki/configure.zcml	Tue Mar  2 13:51:05 2004
@@ -200,10 +200,11 @@
   <!-- Register event listener for change mails -->
   <event:subscribe
       subscriber=".wikipage.mailer"
-      event_types="zope.app.interfaces.event.IObjectAddedEvent
-                   zope.app.interfaces.event.IObjectModifiedEvent
-                   zope.app.interfaces.event.IObjectRemovedEvent
-                   zope.app.interfaces.event.IObjectMovedEvent" />
+      event_types="zope.app.interfaces.container.IObjectAddedEvent
+                   zope.app.event.interfaces.IObjectModifiedEvent
+                   zope.app.interfaces.container.IObjectRemovedEvent
+                   zope.app.interfaces.container.IObjectMovedEvent"
+      />
 
 
   <!-- Register various browser related components, including all views -->


=== Zope3/src/zope/app/wiki/wikipage.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/wiki/wikipage.py:1.2	Tue Mar  2 09:25:00 2004
+++ Zope3/src/zope/app/wiki/wikipage.py	Tue Mar  2 13:51:05 2004
@@ -25,9 +25,9 @@
 from zope.app.dublincore.interfaces import ICMFDublinCore
 from zope.app.interfaces.file import IReadFile, IWriteFile
 from zope.app.interfaces.annotation import IAnnotations
-from zope.app.interfaces.event import ISubscriber
-from zope.app.interfaces.event import IObjectAddedEvent, IObjectModifiedEvent
-from zope.app.interfaces.event import IObjectRemovedEvent, IObjectMovedEvent
+from zope.app.event.interfaces import ISubscriber, IObjectModifiedEvent
+from zope.app.interfaces.container import \
+     IObjectAddedEvent, IObjectRemovedEvent, IObjectMovedEvent
 
 from zope.app.wiki.interfaces import IWiki, IWikiPage, IComment
 from zope.app.wiki.interfaces import IWikiContained, IWikiPageContained
@@ -215,7 +215,7 @@
         self.port = port
 
     def notify(self, event):
-        """See zope.app.interfaces.event.ISubscriber"""
+        """See zope.app.event.interfaces.ISubscriber"""
         if IWikiPage.isImplementedBy(event.object):
             if IObjectAddedEvent.isImplementedBy(event):
                 self.handleAdded(event.object)