Use ``IAdding`` interface from ``zope.browser``

(rather than ``zope.app.container``).

doc/CHANGES.rst

@@ -11,6 +11,9 @@ Trunk (unreleased)
 Restructuring
 +++++++++++++
 
+- Use ``IAdding`` interface from ``zope.browser``, rather than
+  ``zope.app.container``.
+
 - No longer depend on ``zope.app.appsetup``;  use the event implementations
   from ``zope.processlifetime`` instead.
 

src/Products/Five/browser/adding.py

@@ -42,7 +42,7 @@ from zope.traversing.browser.absoluteurl import absoluteURL
 from zope.exceptions.interfaces import UserError
 from zope.lifecycleevent import ObjectCreatedEvent
 
-from zope.app.container.interfaces import IAdding
+from zope.browser.interfaces import IAdding
 from zope.app.publisher.browser.menu import getMenu
 
 from zExceptions import BadRequest
@@ -55,7 +55,7 @@ class BasicAdding(BrowserView):
     implements(IAdding, IPublishTraverse)
 
     def add(self, content):
-        """See zope.app.container.interfaces.IAdding
+        """See zope.browser.interfaces.IAdding
         """
         container = self.context
         name = self.contentName
@@ -90,7 +90,7 @@ class BasicAdding(BrowserView):
     contentName = None # usually set by Adding traverser
 
     def nextURL(self):
-        """See zope.app.container.interfaces.IAdding"""
+        """See zope.browser.interfaces.IAdding"""
         # XXX this is definitely not right for all or even most uses
         # of Five, but can be overridden by an AddView subclass, using
         # the class attribute of a zcml:addform directive

src/Products/Five/doc/products/ViewsTutorial/configure.zcml

@@ -46,7 +46,7 @@
   <!-- .democontent.IDemoContent views -->
 
   <browser:page
-      for="zope.app.container.interfaces.IAdding"
+      for="zope.browser.interfaces.IAdding"
       name="addDemoContent.html"
       template="addDemoContent.pt"
       class=".browser.DemoContentAddView"

src/Products/Five/form/metaconfigure.py

@@ -18,6 +18,7 @@ $Id$
 from App.class_init import InitializeClass
 from ExtensionClass import Base
 
+from zope.browser.interfaces import IAdding
 import zope.component
 from zope.interface import Interface
 from zope.i18nmessageid import MessageFactory
@@ -25,7 +26,6 @@ _ = MessageFactory('zope')
 
 from zope.app.publisher.browser.menumeta import menuItemDirective
 from zope.app.form.browser.metaconfigure import BaseFormDirective
-from zope.app.container.interfaces import IAdding
 
 from Products.Five.form import EditView, AddView
 from Products.Five.metaclass import makeClass

versions.cfg

@@ -35,7 +35,6 @@ zope.app.broken = 3.5.0
 zope.app.cache = 3.5.0
 zope.app.catalog = 3.8.0
 zope.app.component = 3.7.0
-zope.app.container = 3.7.2
 zope.app.content = 3.4.0
 zope.app.dav = 3.5.0
 zope.app.debug = 3.4.1
@@ -73,7 +72,7 @@ zope.app.zopeappgenerations = 3.5.0
 zope.app.zptpage = 3.5.0
 zope.authentication = 3.7.0
 zope.broken = 3.5.0
-zope.browser = 0.5.0
+zope.browser = 1.1
 zope.cachedescriptors = 3.5.0
 zope.catalog = 3.8.0
 zope.component = 3.6.0