[Checkins] SVN: z3c.form/trunk/ Require at least zope.app.container 3.7 for adding support.

[Hano Schlichting]

Log message for revision 126419:
  Require at least zope.app.container 3.7 for adding support.
  

Changed:
  U   z3c.form/trunk/CHANGES.txt
  U   z3c.form/trunk/setup.py
  U   z3c.form/trunk/src/z3c/form/adding.txt
  U   z3c.form/trunk/src/z3c/form/compatibility.py

-=-
Modified: z3c.form/trunk/CHANGES.txt
===================================================================
--- z3c.form/trunk/CHANGES.txt	2012-05-21 20:44:43 UTC (rev 126418)
+++ z3c.form/trunk/CHANGES.txt	2012-05-21 20:51:35 UTC (rev 126419)
@@ -2,9 +2,11 @@
 CHANGES
 =======
 
-2.6.2 (unreleased)
+2.7.0 (unreleased)
 ------------------
 
+- Require at least zope.app.container 3.7 for adding support.
+
 - Avoid dependency on ZODB3.
 
 2.6.1 (2012-01-30)

Modified: z3c.form/trunk/setup.py
===================================================================
--- z3c.form/trunk/setup.py	2012-05-21 20:44:43 UTC (rev 126418)
+++ z3c.form/trunk/setup.py	2012-05-21 20:51:35 UTC (rev 126419)
@@ -47,7 +47,7 @@
 
 setup(
     name='z3c.form',
-    version='2.6.2dev',
+    version='2.7.0dev',
     author="Stephan Richter, Roger Ineichen and the Zope Community",
     author_email="zope-dev at zope.org",
     description="An advanced form and widget framework for Zope 3",
@@ -86,8 +86,7 @@
             'z3c.template >= 1.3',
             'zc.sourcefactory',
             'zope.app.component',
-            # zope.app.container pulls in zope.container, if newer version
-            'zope.app.container',
+            'zope.app.container >= 3.7',
             'zope.app.pagetemplate',
             'zope.app.publisher',
             'zope.app.testing',
@@ -100,7 +99,7 @@
         latest=[
             'zope.site',
             ],
-        adding=['zope.app.container'],
+        adding=['zope.app.container >= 3.7'],
         docs=['z3c.recipe.sphinxdoc'],
         ),
     install_requires=[

Modified: z3c.form/trunk/src/z3c/form/adding.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/adding.txt	2012-05-21 20:44:43 UTC (rev 126418)
+++ z3c.form/trunk/src/z3c/form/adding.txt	2012-05-21 20:51:35 UTC (rev 126419)
@@ -35,8 +35,8 @@
 
 Next we need a container to which we wish to add the person:
 
-  >>> from zope.app.container import btree
-  >>> people = btree.BTreeContainer()
+  >>> from zope.container.btree import BTreeContainer
+  >>> people = BTreeContainer()
 
 When creating and adding a new object using the ``IAdding`` API, the container
 is adapted to ``IAdding`` view:

Modified: z3c.form/trunk/src/z3c/form/compatibility.py
===================================================================
--- z3c.form/trunk/src/z3c/form/compatibility.py	2012-05-21 20:44:43 UTC (rev 126418)
+++ z3c.form/trunk/src/z3c/form/compatibility.py	2012-05-21 20:51:35 UTC (rev 126419)
@@ -43,19 +43,6 @@
         import zope.app.component.hooks
         zope.component.hooks = zope.app.component.hooks
 
-def addBTree():
-    try:
-        import zope.container.btree
-        return
-    except ImportError:
-        try:
-            import zope.app.container.btree
-            container = types.ModuleType('container')
-            container.btree = zope.app.container.btree
-            sys.modules['zope.container'] = container
-        except ImportError:
-            pass # only for tests
 
 def apply():
     addHooks()
-    addBTree()