[Zope3-checkins] CVS: Zope3/src/zope/app/browser/container - adding.py:1.44 configure.zcml:1.21 contents.py:1.32

[Philipp von Weitershausen]

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

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


=== Zope3/src/zope/app/browser/container/adding.py 1.43 => 1.44 ===
--- Zope3/src/zope/app/browser/container/adding.py:1.43	Fri Feb 13 17:42:22 2004
+++ Zope3/src/zope/app/browser/container/adding.py	Wed Mar  3 05:38:33 2004
@@ -26,9 +26,9 @@
 from zope.proxy import removeAllProxies
 
 from zope.app.interfaces.exceptions import UserError
-from zope.app.interfaces.container import IAdding
-from zope.app.interfaces.container import IContainerNamesContainer
-from zope.app.interfaces.container import INameChooser
+from zope.app.container.interfaces import IAdding
+from zope.app.container.interfaces import IContainerNamesContainer
+from zope.app.container.interfaces import INameChooser
 
 from zope.app import zapi
 from zope.app.event.objectevent import ObjectCreatedEvent
@@ -45,7 +45,7 @@
     implements(IAdding, IPublishTraverse)
 
     def add(self, content):
-        """See zope.app.interfaces.container.IAdding
+        """See zope.app.container.interfaces.IAdding
         """
         container = self.context
         name = self.contentName
@@ -72,7 +72,7 @@
     contentName = None # usually set by Adding traverser
 
     def nextURL(self):
-        """See zope.app.interfaces.container.IAdding"""
+        """See zope.app.container.interfaces.IAdding"""
         return (str(zapi.getView(self.context, "absolute_url", self.request))
                 + '/@@contents.html')
 
@@ -105,7 +105,7 @@
                     % (add_button_value, add_button_label, contentName))
 
     def publishTraverse(self, request, name):
-        """See zope.app.interfaces.container.IAdding"""
+        """See zope.app.container.interfaces.IAdding"""
         if '=' in name:
             view_name, content_name = name.split("=", 1)
             self.contentName = content_name


=== Zope3/src/zope/app/browser/container/configure.zcml 1.20 => 1.21 ===
--- Zope3/src/zope/app/browser/container/configure.zcml:1.20	Thu Dec 18 05:26:35 2003
+++ Zope3/src/zope/app/browser/container/configure.zcml	Wed Mar  3 05:38:33 2004
@@ -3,7 +3,7 @@
    xmlns="http://namespaces.zope.org/browser">
 
   <view
-      for="zope.app.interfaces.container.IContentContainer"
+      for="zope.app.container.interfaces.IContentContainer"
       name="+"
       menu="zmi_actions" title="Add"
       class="zope.app.browser.container.adding.ContentAdding"
@@ -17,7 +17,7 @@
   </view>
 
   <page
-      for="zope.app.interfaces.container.IReadContainer"
+      for="zope.app.container.interfaces.IReadContainer"
       name="find.html"
       permission="zope.ManageContent"
       class="zope.app.browser.container.find.Find"
@@ -25,7 +25,7 @@
       menu="zmi_actions" title="Find" />
 
   <page
-      for="zope.app.interfaces.container.IWriteContainer"
+      for="zope.app.container.interfaces.IWriteContainer"
       permission="zope.ManageContent"
       name="commonTasks"
       class="zope.app.browser.container.contents.Contents"


=== Zope3/src/zope/app/browser/container/contents.py 1.31 => 1.32 ===
--- Zope3/src/zope/app/browser/container/contents.py:1.31	Mon Mar  1 10:02:44 2004
+++ Zope3/src/zope/app/browser/container/contents.py	Wed Mar  3 05:38:33 2004
@@ -16,21 +16,23 @@
 $Id$
 """
 
+from zope.exceptions import NotFoundError
+
 from zope.app import zapi
-from zope.app.interfaces.container import IContainer
-from zope.app.dublincore.interfaces import IZopeDublinCore
 from zope.app.interfaces.size import ISized
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.app.publisher.browser import BrowserView
+from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.dublincore.interfaces import IZopeDublinCore
+from zope.app.dublincore.interfaces import IDCDescriptiveProperties
 from zope.app.interfaces.copypastemove import IPrincipalClipboard
 from zope.app.interfaces.copypastemove import IObjectCopier
 from zope.app.interfaces.copypastemove import IObjectMover
-from zope.app.dublincore.interfaces import IDCDescriptiveProperties
-from zope.app.i18n import ZopeMessageIDFactory as _
-from zope.app.browser.container.adding import BasicAdding
 from zope.app.copypastemove import rename
-from zope.exceptions import NotFoundError
-from zope.app.interfaces.container import IContainerNamesContainer
+
+from zope.app.browser.container.adding import BasicAdding
+from zope.app.container.interfaces import IContainer
+from zope.app.container.interfaces import IContainerNamesContainer
 
 class Contents(BrowserView):