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

[Wolfgang Schnerring]

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

Changed:
  U   zope.copypastemove/trunk/CHANGES.txt
  U   zope.copypastemove/trunk/setup.py
  U   zope.copypastemove/trunk/src/zope/copypastemove/__init__.py

-=-
Modified: zope.copypastemove/trunk/CHANGES.txt
===================================================================
--- zope.copypastemove/trunk/CHANGES.txt	2009-01-29 18:41:55 UTC (rev 95492)
+++ zope.copypastemove/trunk/CHANGES.txt	2009-01-29 18:44:19 UTC (rev 95493)
@@ -1,7 +1,7 @@
 Changes
 =======
 
-3.4.2 (unreleased)
+3.5.0 (unreleased)
 ------------------
 
 * Use zope.container instead of zope.app.container.

Modified: zope.copypastemove/trunk/setup.py
===================================================================
--- zope.copypastemove/trunk/setup.py	2009-01-29 18:41:55 UTC (rev 95492)
+++ zope.copypastemove/trunk/setup.py	2009-01-29 18:44:19 UTC (rev 95493)
@@ -23,7 +23,7 @@
                     open('CHANGES.txt').read())
 
 setup(name='zope.copypastemove',
-      version = '3.4.2dev',
+      version = '3.5.0dev',
       url='http://pypi.python.org/pypi/zope.copypastemove',
       license='ZPL 2.1',
       author='Zope Corporation and Contributors',

Modified: zope.copypastemove/trunk/src/zope/copypastemove/__init__.py
===================================================================
--- zope.copypastemove/trunk/src/zope/copypastemove/__init__.py	2009-01-29 18:41:55 UTC (rev 95492)
+++ zope.copypastemove/trunk/src/zope/copypastemove/__init__.py	2009-01-29 18:44:19 UTC (rev 95493)
@@ -51,7 +51,7 @@
     contained in a container that has an adapter to `INameChooser`.
 
 
-    >>> from zope.app.container.contained import Contained
+    >>> from zope.container.contained import Contained
     >>> ob = Contained()
     >>> container = ExampleContainer()
     >>> container[u'foo'] = ob
@@ -134,13 +134,13 @@
     ...         "Add an item"
     ...     __setitem__.precondition = preNoZ
 
-    >>> from zope.app.container.interfaces import IContainer
+    >>> from zope.container.interfaces import IContainer
     >>> class C1(object):
     ...     zope.interface.implements(I1, IContainer)
     ...     def __repr__(self):
     ...         return 'C1'
 
-    >>> from zope.app.container.constraints import checkObject
+    >>> from zope.container.constraints import checkObject
     >>> container3 = C1()
     >>> mover.moveableTo(container3, 'ZDummy')
     False
@@ -232,7 +232,7 @@
     The contained `object` should implement `IContained`.  It should be
     contained in a container that has an adapter to `INameChooser`.
 
-    >>> from zope.app.container.contained import Contained
+    >>> from zope.container.contained import Contained
     >>> ob = Contained()
     >>> container = ExampleContainer()
     >>> container[u'foo'] = ob
@@ -326,13 +326,13 @@
     ...         "Add an item"
     ...     __setitem__.precondition = preNoZ
 
-    >>> from zope.app.container.interfaces import IContainer
+    >>> from zope.container.interfaces import IContainer
     >>> class C1(object):
     ...     zope.interface.implements(I1, IContainer)
     ...     def __repr__(self):
     ...         return 'C1'
 
-    >>> from zope.app.container.constraints import checkObject
+    >>> from zope.container.constraints import checkObject
     >>> container3 = C1()
     >>> copier.copyableTo(container3, 'ZDummy')
     False
@@ -428,7 +428,7 @@
     This adapter uses IObjectMover to move an item within the same container
     to a different name. We need to first setup an adapter for IObjectMover:
 
-      >>> from zope.app.container.interfaces import IContained
+      >>> from zope.container.interfaces import IContained
       >>> gsm = zope.component.getGlobalSiteManager()
       >>> gsm.registerAdapter(ObjectMover, (IContained, ), IObjectMover)
 
@@ -440,7 +440,7 @@
 
     For this example, we'll rename an item 'foo':
 
-      >>> from zope.app.container.contained import Contained
+      >>> from zope.container.contained import Contained
       >>> foo = Contained()
       >>> container['foo'] = foo
       >>> container['foo'] is foo
@@ -496,14 +496,14 @@
     To illustrate, we need to setup an IObjectMover, which is used in the
     renaming:
 
-      >>> from zope.app.container.interfaces import IContained
+      >>> from zope.container.interfaces import IContained
       >>> gsm = zope.component.getGlobalSiteManager()
       >>> gsm.registerAdapter(ObjectMover, (IContained, ), IObjectMover)
 
     To rename an item in an ordered container, we instantiate a
     OrderedContainerItemRenamer with the container:
 
-      >>> from zope.app.container.ordered import OrderedContainer
+      >>> from zope.container.ordered import OrderedContainer
       >>> container = OrderedContainer()
       >>> renamer = OrderedContainerItemRenamer(container)