[Checkins] SVN: grokcore.formlib/trunk/ using zope.container instead of zope.app.container in configure.zcml

[Reinout van Rees]

Log message for revision 106300:
  using zope.container instead of zope.app.container in configure.zcml
  This includes the needed setup.py requirements change.

Changed:
  U   grokcore.formlib/trunk/CHANGES.txt
  U   grokcore.formlib/trunk/setup.py
  U   grokcore.formlib/trunk/src/grokcore/formlib/configure.zcml

-=-
Modified: grokcore.formlib/trunk/CHANGES.txt
===================================================================
--- grokcore.formlib/trunk/CHANGES.txt	2009-12-08 16:01:30 UTC (rev 106299)
+++ grokcore.formlib/trunk/CHANGES.txt	2009-12-08 16:04:27 UTC (rev 106300)
@@ -4,10 +4,10 @@
 1.5 (unreleased)
 ----------------
 
-- Use zope.container instead of zope.app.container (in tests).
+- Use zope.container instead of zope.app.container (in tests and in the
+  configure.zcml).
 
-- Fixed up missing dependencies. (Note that zope.app.container is included in
-  a zcml, despite the zope(app)container test change).
+- Fixed up missing dependencies. 
 
 
 1.4 (2009-09-17)

Modified: grokcore.formlib/trunk/setup.py
===================================================================
--- grokcore.formlib/trunk/setup.py	2009-12-08 16:01:30 UTC (rev 106299)
+++ grokcore.formlib/trunk/setup.py	2009-12-08 16:04:27 UTC (rev 106300)
@@ -38,7 +38,7 @@
                       'grokcore.view >= 1.12',
                       'martian >= 0.10',
                       'pytz',
-                      'zope.app.container',
+                      'zope.container',
                       'zope.event',
                       'zope.formlib',
                       'zope.interface',
@@ -50,7 +50,6 @@
                       'zope.app.zcmlfiles',
                       'zope.component',
                       'zope.configuration',
-                      'zope.container',
                       'zope.securitypolicy',
                       'zope.testbrowser',
                       'zope.testing',

Modified: grokcore.formlib/trunk/src/grokcore/formlib/configure.zcml
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/configure.zcml	2009-12-08 16:01:30 UTC (rev 106299)
+++ grokcore.formlib/trunk/src/grokcore/formlib/configure.zcml	2009-12-08 16:04:27 UTC (rev 106300)
@@ -1,7 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
   <include package="grokcore.view" />
-  <include package="zope.app.container" />
+  <include package="zope.container" />
   <include package="zope.formlib" />
 
 </configure>