[Checkins] SVN: grokcore.formlib/trunk/ use zope.container instead of zope.app.container (in tests)

[Jan-Wijbrand Kolman]

Log message for revision 106140:
  use zope.container instead of zope.app.container (in tests)

Changed:
  U   grokcore.formlib/trunk/CHANGES.txt
  U   grokcore.formlib/trunk/buildout.cfg
  U   grokcore.formlib/trunk/setup.py
  U   grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform.py
  U   grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform_applydata.py

-=-
Modified: grokcore.formlib/trunk/CHANGES.txt
===================================================================
--- grokcore.formlib/trunk/CHANGES.txt	2009-12-01 17:16:53 UTC (rev 106139)
+++ grokcore.formlib/trunk/CHANGES.txt	2009-12-01 18:50:18 UTC (rev 106140)
@@ -4,7 +4,7 @@
 1.5 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Use zope.container instead of zope.app.container (in tests).
 
 
 1.4 (2009-09-17)

Modified: grokcore.formlib/trunk/buildout.cfg
===================================================================
--- grokcore.formlib/trunk/buildout.cfg	2009-12-01 17:16:53 UTC (rev 106139)
+++ grokcore.formlib/trunk/buildout.cfg	2009-12-01 18:50:18 UTC (rev 106140)
@@ -1,12 +1,11 @@
 [buildout]
 develop = .
 parts = interpreter test
-extends = http://grok.zope.org/releaseinfo/grok-1.0b1.cfg
+extends = http://grok.zope.org/releaseinfo/grok-1.1a1.cfg
 versions = versions
 
 [versions]
 grokcore.formlib = 
-grokcore.view = 1.12
 
 [interpreter]
 recipe = zc.recipe.egg

Modified: grokcore.formlib/trunk/setup.py
===================================================================
--- grokcore.formlib/trunk/setup.py	2009-12-01 17:16:53 UTC (rev 106139)
+++ grokcore.formlib/trunk/setup.py	2009-12-01 18:50:18 UTC (rev 106140)
@@ -39,7 +39,9 @@
                       'grokcore.view >= 1.12',
                       'zope.formlib',
                       # for tests:
+                      'zope.container',
                       'zope.testing',
+                      'zope.testbrowser',
                       'zope.lifecycleevent',
                       'zope.securitypolicy',
                       'zope.app.zcmlfiles',

Modified: grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform.py
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform.py	2009-12-01 17:16:53 UTC (rev 106139)
+++ grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform.py	2009-12-01 18:50:18 UTC (rev 106140)
@@ -28,9 +28,9 @@
 import grokcore.formlib as grok
 from zope import schema
 from zope.interface import Interface, implements
-from zope.app.container.btree import BTreeContainer
-from zope.app.container.contained import Contained
-from zope.app.container.interfaces import IContainer
+from zope.container.btree import BTreeContainer
+from zope.container.contained import Contained
+from zope.container.interfaces import IContainer
 
 class Zoo(grok.testing.Model, BTreeContainer):
     grok.testing.protect_get(grok.Public, *IContainer)

Modified: grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform_applydata.py
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform_applydata.py	2009-12-01 17:16:53 UTC (rev 106139)
+++ grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform_applydata.py	2009-12-01 18:50:18 UTC (rev 106140)
@@ -30,8 +30,8 @@
 import grokcore.formlib as grok
 from zope import schema, interface
 from zope.lifecycleevent.interfaces import IObjectModifiedEvent
-from zope.app.container.btree import BTreeContainer
-from zope.app.container.interfaces import IContainer
+from zope.container.btree import BTreeContainer
+from zope.container.interfaces import IContainer
 
 class Zoo(grok.testing.Model, BTreeContainer):
     grok.testing.protect_get(grok.Public, *IContainer)