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

[Philipp von Weitershausen]

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

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


=== Zope3/src/zope/app/wiki/configure.zcml 1.5 => 1.6 ===
--- Zope3/src/zope/app/wiki/configure.zcml:1.5	Tue Mar  2 13:51:05 2004
+++ Zope3/src/zope/app/wiki/configure.zcml	Wed Mar  3 05:38:57 2004
@@ -85,7 +85,7 @@
 
  <content class=".wiki.Wiki">
 
-    <implements interface="zope.app.interfaces.container.IContentContainer" />
+    <implements interface="zope.app.container.interfaces.IContentContainer" />
 
     <implements
        interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
@@ -97,11 +97,11 @@
 
     <require
         permission="zope.View"
-        interface="zope.app.interfaces.container.IReadContainer"/>
+        interface="zope.app.container.interfaces.IReadContainer"/>
 
     <require
         permission="zope.app.wiki.AddWikiPage"
-        interface="zope.app.interfaces.container.IWriteContainer"/>
+        interface="zope.app.container.interfaces.IWriteContainer"/>
 
   </content>
 
@@ -200,10 +200,10 @@
   <!-- Register event listener for change mails -->
   <event:subscribe
       subscriber=".wikipage.mailer"
-      event_types="zope.app.interfaces.container.IObjectAddedEvent
+      event_types="zope.app.container.interfaces.IObjectAddedEvent
                    zope.app.event.interfaces.IObjectModifiedEvent
-                   zope.app.interfaces.container.IObjectRemovedEvent
-                   zope.app.interfaces.container.IObjectMovedEvent"
+                   zope.app.container.interfaces.IObjectRemovedEvent
+                   zope.app.container.interfaces.IObjectMovedEvent"
       />
 
 


=== Zope3/src/zope/app/wiki/interfaces.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/wiki/interfaces.py:1.2	Tue Mar  2 09:25:00 2004
+++ Zope3/src/zope/app/wiki/interfaces.py	Wed Mar  3 05:38:57 2004
@@ -22,10 +22,10 @@
 from zope.schema.vocabulary import VocabularyField
 
 from zope.schema import Field
-from zope.app.interfaces.container import IContained
+from zope.app.container.interfaces import IContained
+from zope.app.container.interfaces import IContainer, IContentContainer
 from zope.app.container.constraints import ContainerTypesConstraint
 from zope.app.container.constraints import ItemTypePrecondition
-from zope.app.interfaces.container import IContainer, IContentContainer
 from zope.app.i18n import ZopeMessageIDFactory as _ 
 
 class IComment(Interface):


=== Zope3/src/zope/app/wiki/wikipage.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/wiki/wikipage.py:1.3	Tue Mar  2 13:51:05 2004
+++ Zope3/src/zope/app/wiki/wikipage.py	Wed Mar  3 05:38:57 2004
@@ -26,7 +26,7 @@
 from zope.app.interfaces.file import IReadFile, IWriteFile
 from zope.app.interfaces.annotation import IAnnotations
 from zope.app.event.interfaces import ISubscriber, IObjectModifiedEvent
-from zope.app.interfaces.container import \
+from zope.app.container.interfaces import \
      IObjectAddedEvent, IObjectRemovedEvent, IObjectMovedEvent
 
 from zope.app.wiki.interfaces import IWiki, IWikiPage, IComment
@@ -44,7 +44,7 @@
 
     implements(IWikiPage, IWikiContained)
 
-    # See zope.app.interfaces.container.IContained
+    # See zope.app.container.interfaces.IContained
     __parent__ = __name__ = None
 
     # See zope.app.wiki.interfaces.IWikiPage
@@ -110,7 +110,7 @@
     """A simple persistent comment implementation."""
     implements(IComment, IWikiPageContained)
     
-    # See zope.app.interfaces.container.IContained
+    # See zope.app.container.interfaces.IContained
     __parent__ = __name__ = None
 
     # See zope.app.wiki.interfaces.IComment