[Checkins] SVN: zope.app.form/trunk/ Require `zope.browser` 1.1 instead of `zope.app.container` for IAdding.

[Hanno Schlichting]

Log message for revision 100341:
  Require `zope.browser` 1.1 instead of `zope.app.container` for IAdding.
  

Changed:
  U   zope.app.form/trunk/CHANGES.txt
  U   zope.app.form/trunk/setup.py
  U   zope.app.form/trunk/src/zope/app/form/browser/metaconfigure.py
  U   zope.app.form/trunk/src/zope/app/form/browser/tests/test_add.py
  U   zope.app.form/trunk/src/zope/app/form/browser/tests/test_widgetdirective.py

-=-
Modified: zope.app.form/trunk/CHANGES.txt
===================================================================
--- zope.app.form/trunk/CHANGES.txt	2009-05-24 18:34:56 UTC (rev 100340)
+++ zope.app.form/trunk/CHANGES.txt	2009-05-24 19:21:42 UTC (rev 100341)
@@ -2,10 +2,10 @@
 CHANGES
 =======
 
-3.7.4 (unreleased)
+3.8.0 (unreleased)
 ==================
 
-- ...
+- Require `zope.browser` 1.1 instead of `zope.app.container` for IAdding.
 
 3.7.3 (2009-05-11)
 ==================

Modified: zope.app.form/trunk/setup.py
===================================================================
--- zope.app.form/trunk/setup.py	2009-05-24 18:34:56 UTC (rev 100340)
+++ zope.app.form/trunk/setup.py	2009-05-24 19:21:42 UTC (rev 100341)
@@ -54,7 +54,7 @@
           'Operating System :: OS Independent',
           'Topic :: Internet :: WWW/HTTP',
           'Framework :: Zope3'],
-      url='http://cheeseshop.python.org/pypi/zope.app.form',
+      url='http://pypi.python.org/pypi/zope.app.form',
       license='ZPL 2.1',
       packages=find_packages('src'),
       package_dir = {'': 'src'},
@@ -66,8 +66,7 @@
       install_requires=[
           "setuptools",
           "ZODB3",
-          "zope.browser",
-          "zope.app.container",
+          "zope.browser >= 1.1",
           "zope.app.publisher",
           "zope.cachedescriptors",
           "zope.component",

Modified: zope.app.form/trunk/src/zope/app/form/browser/metaconfigure.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/metaconfigure.py	2009-05-24 18:34:56 UTC (rev 100340)
+++ zope.app.form/trunk/src/zope/app/form/browser/metaconfigure.py	2009-05-24 19:21:42 UTC (rev 100341)
@@ -24,8 +24,8 @@
 from zope.interface import implementedBy
 from zope.configuration.exceptions import ConfigurationError
 
+from zope.browser.interfaces import IAdding
 from zope.schema import getFieldNamesInOrder
-from zope.app.container.interfaces import IAdding
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 from zope.app.publisher.browser.menumeta import menuItemDirective

Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_add.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_add.py	2009-05-24 18:34:56 UTC (rev 100340)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_add.py	2009-05-24 19:21:42 UTC (rev 100341)
@@ -17,6 +17,7 @@
 """
 import unittest
 
+from zope.browser.interfaces import IAdding
 from zope.component import getMultiAdapter
 from zope.component.interfaces import IFactory
 from zope.component.interfaces import IComponentLookup
@@ -31,7 +32,6 @@
 from zope.lifecycleevent.interfaces import IObjectCreatedEvent, IObjectModifiedEvent
 
 from zope.app.component.site import SiteManagerAdapter
-from zope.app.container.interfaces import IAdding
 from zope.app.form import CustomWidgetFactory
 from zope.app.form.browser import TextWidget as Text
 from zope.app.form.browser.add import AddViewFactory, AddView

Modified: zope.app.form/trunk/src/zope/app/form/browser/tests/test_widgetdirective.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/tests/test_widgetdirective.py	2009-05-24 18:34:56 UTC (rev 100340)
+++ zope.app.form/trunk/src/zope/app/form/browser/tests/test_widgetdirective.py	2009-05-24 19:21:42 UTC (rev 100341)
@@ -22,8 +22,8 @@
 import zope.configuration.xmlconfig
 import zope.publisher.browser
 import zope.schema
+from zope.browser.interfaces import IAdding
 
-import zope.app.container.interfaces
 import zope.app.form.browser.interfaces
 import zope.app.form.interfaces
 from zope.app.form.tests import utils
@@ -54,8 +54,7 @@
 
 class Adding(object):
 
-    zope.interface.implements(
-        zope.app.container.interfaces.IAdding)
+    zope.interface.implements(IAdding)
 
     def add(self, content):
         self.content = content