[Checkins] SVN: grokcore.annotation/trunk/ use zope.container instead of zope.app.container

[Jan-Wijbrand Kolman]

Log message for revision 106139:
  use zope.container instead of zope.app.container

Changed:
  U   grokcore.annotation/trunk/CHANGES.txt
  U   grokcore.annotation/trunk/buildout.cfg
  U   grokcore.annotation/trunk/setup.py
  U   grokcore.annotation/trunk/src/grokcore/annotation/components.py

-=-
Modified: grokcore.annotation/trunk/CHANGES.txt
===================================================================
--- grokcore.annotation/trunk/CHANGES.txt	2009-12-01 15:34:12 UTC (rev 106138)
+++ grokcore.annotation/trunk/CHANGES.txt	2009-12-01 17:16:53 UTC (rev 106139)
@@ -4,7 +4,7 @@
 1.2 (unreleased)
 ----------------
 
-* ...
+* Use zope.container instead of zope.app.container.
 
 1.1 (2009-09-18)
 ----------------

Modified: grokcore.annotation/trunk/buildout.cfg
===================================================================
--- grokcore.annotation/trunk/buildout.cfg	2009-12-01 15:34:12 UTC (rev 106138)
+++ grokcore.annotation/trunk/buildout.cfg	2009-12-01 17:16:53 UTC (rev 106139)
@@ -1,7 +1,7 @@
 [buildout]
 develop = .
 parts = interpreter test
-extends = http://grok.zope.org/releaseinfo/grok-1.0b2.cfg
+extends = http://grok.zope.org/releaseinfo/grok-1.1a1.cfg
 versions = versions
 
 [versions]

Modified: grokcore.annotation/trunk/setup.py
===================================================================
--- grokcore.annotation/trunk/setup.py	2009-12-01 15:34:12 UTC (rev 106138)
+++ grokcore.annotation/trunk/setup.py	2009-12-01 17:16:53 UTC (rev 106139)
@@ -33,14 +33,14 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=['setuptools',
+                      'ZODB3',
+                      'grokcore.component',
                       'martian',
+                      'zope.annotation',
                       'zope.component',
+                      'zope.configuration',
+                      'zope.container',
                       'zope.interface',
-                      'zope.annotation',
-                      'grokcore.component',
-                      'ZODB3',
-                      'zope.app.container',
-                      'zope.configuration',
                       'zope.testing',
                       ],
     )

Modified: grokcore.annotation/trunk/src/grokcore/annotation/components.py
===================================================================
--- grokcore.annotation/trunk/src/grokcore/annotation/components.py	2009-12-01 15:34:12 UTC (rev 106138)
+++ grokcore.annotation/trunk/src/grokcore/annotation/components.py	2009-12-01 17:16:53 UTC (rev 106139)
@@ -16,7 +16,7 @@
 """
 
 from zope.annotation.interfaces import IAttributeAnnotatable
-from zope.app.container import contained
+from zope.container import contained
 import persistent
 import grokcore.component