rename zope.app.container to zope.container

src/zope/container/_zope_proxy_proxy.c

@@ -14,8 +14,8 @@
 
 /*
  *   This file is also used as a really extensive macro in
- *   ../app/container/_zope_app_container_contained.c.  If you need to
- *   change this file, you need to "svn copy" it to ../app/container/.
+ *   ../app/container/_zope_container_contained.c.  If you need to
+ *   change this file, you need to "svn copy" it to ../container/.
  *
  *   This approach is taken to allow the sources for the two packages
  *   to be compilable when the relative locations of these aren't

src/zope/container/btree.py

@@ -21,8 +21,8 @@ from persistent import Persistent
 from BTrees.OOBTree import OOBTree
 from BTrees.Length import Length
 
-from zope.app.container.interfaces import IBTreeContainer
-from zope.app.container.contained import Contained, setitem, uncontained
+from zope.container.interfaces import IBTreeContainer
+from zope.container.contained import Contained, setitem, uncontained
 from zope.cachedescriptors.property import Lazy
 from zope.interface import implements
 

src/zope/container/constraints.py

@@ -33,7 +33,7 @@
    ...         "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):
@@ -157,9 +157,9 @@ from zope.cachedescriptors.property import readproperty
 from zope.dottedname.resolve import resolve
 import zope.schema
 from zope.interface import providedBy
-from zope.app.container.interfaces import InvalidItemType, InvalidContainerType
-from zope.app.container.i18n import ZopeMessageFactory as _
-from zope.app.container.interfaces import IContainer
+from zope.container.interfaces import InvalidItemType, InvalidContainerType
+from zope.container.i18n import ZopeMessageFactory as _
+from zope.container.interfaces import IContainer
 
 def checkObject(container, name, object):
     """Check containement constraints for an object and container
@@ -425,7 +425,7 @@ def containers(*types):
       >>> class IBar(IContainer):
       ...     pass
 
-      >>> from zope.app.container.interfaces import IContained
+      >>> from zope.container.interfaces import IContained
       >>> class IFooBarContained(IContained):
       ...     containers(IFoo, IBar)
 

src/zope/container/contained.py

@@ -29,15 +29,15 @@ from zope.exceptions.interfaces import DuplicationError, UserError
 from zope.security.checker import selectChecker, CombinedChecker
 from zope.lifecycleevent import ObjectModifiedEvent
 
-from zope.app.container.i18n import ZopeMessageFactory as _
-from zope.app.container.interfaces import IContained
-from zope.app.container.interfaces import INameChooser
-from zope.app.container.interfaces import IObjectAddedEvent
-from zope.app.container.interfaces import IObjectMovedEvent
-from zope.app.container.interfaces import IObjectRemovedEvent
-from zope.app.container.interfaces import IContainerModifiedEvent
-from zope.app.container._zope_app_container_contained import ContainedProxyBase
-from zope.app.container._zope_app_container_contained import getProxiedObject
+from zope.container.i18n import ZopeMessageFactory as _
+from zope.container.interfaces import IContained
+from zope.container.interfaces import INameChooser
+from zope.container.interfaces import IObjectAddedEvent
+from zope.container.interfaces import IObjectMovedEvent
+from zope.container.interfaces import IObjectRemovedEvent
+from zope.container.interfaces import IContainerModifiedEvent
+from zope.container._zope_app_container_contained import ContainedProxyBase
+from zope.container._zope_app_container_contained import getProxiedObject
 from zope.app.broken.interfaces import IBroken
 
 class Contained(object):
@@ -380,8 +380,8 @@ def setitem(container, setitemf, name, object):
     ...     def setMoved(self, event):
     ...         self.moved = event
 
-    >>> from zope.app.container.interfaces import IObjectAddedEvent
-    >>> from zope.app.container.interfaces import IObjectMovedEvent
+    >>> from zope.container.interfaces import IObjectAddedEvent
+    >>> from zope.container.interfaces import IObjectMovedEvent
     >>> from zope.app.testing import ztapi
 
     >>> ztapi.subscribe([IItem, IObjectAddedEvent], None,
@@ -601,7 +601,7 @@ def uncontained(object, container, name=None):
 
     >>> from zope.component.eventtesting import getEvents
     >>> from zope.lifecycleevent.interfaces import IObjectModifiedEvent
-    >>> from zope.app.container.interfaces import IObjectRemovedEvent
+    >>> from zope.container.interfaces import IObjectRemovedEvent
 
     We'll start by creating a container with an item:
 
@@ -705,14 +705,14 @@ class NameChooser(object):
         self.context = context
 
     def checkName(self, name, object):
-        """See zope.app.container.interfaces.INameChooser
+        """See zope.container.interfaces.INameChooser
 
         We create and populate a dummy container
 
-        >>> from zope.app.container.sample import SampleContainer
+        >>> from zope.container.sample import SampleContainer
         >>> container = SampleContainer()
         >>> container['foo'] = 'bar'
-        >>> from zope.app.container.contained import NameChooser
+        >>> from zope.container.contained import NameChooser
 
         All these names are invalid:
 
@@ -769,17 +769,17 @@ class NameChooser(object):
 
 
     def chooseName(self, name, object):
-        """See zope.app.container.interfaces.INameChooser
+        """See zope.container.interfaces.INameChooser
 
         The name chooser is expected to choose a name without error
         
         We create and populate a dummy container
 
-        >>> from zope.app.container.sample import SampleContainer
+        >>> from zope.container.sample import SampleContainer
         >>> container = SampleContainer()
         >>> container['foo.old.rst'] = 'rst doc'
 
-        >>> from zope.app.container.contained import NameChooser
+        >>> from zope.container.contained import NameChooser
         >>> NameChooser(container).chooseName('+@+@foo.old.rst', object())
         u'foo.old-2.rst'
         >>> NameChooser(container).chooseName('+@+@foo/foo', object())

src/zope/container/dependency.py

@@ -21,7 +21,7 @@ $Id$
 __docformat__ = 'restructuredtext'
 
 from zope.i18nmessageid import Message
-from zope.app.container.i18n import ZopeMessageFactory as _
+from zope.container.i18n import ZopeMessageFactory as _
 from zope.app.dependable.interfaces import IDependable, DependencyError
 from zope.traversing.api import getPath
 

src/zope/container/ordered.py

@@ -17,14 +17,14 @@ $Id$
 """
 __docformat__ = 'restructuredtext'
 
-from zope.app.container.interfaces import IOrderedContainer
+from zope.container.interfaces import IOrderedContainer
 from zope.interface import implements
 from persistent import Persistent
 from persistent.dict import PersistentDict
 from persistent.list import PersistentList
 from types import StringTypes, TupleType, ListType
-from zope.app.container.contained import Contained, setitem, uncontained
-from zope.app.container.contained import notifyContainerModified
+from zope.container.contained import Contained, setitem, uncontained
+from zope.container.contained import notifyContainerModified
 
 class OrderedContainer(Persistent, Contained):
     """ `OrderedContainer` maintains entries' order as added and moved.

src/zope/container/sample.py

@@ -22,9 +22,9 @@ $Id$
 """
 __docformat__ = 'restructuredtext'
 
-from zope.app.container.interfaces import IContainer
+from zope.container.interfaces import IContainer
 from zope.interface import implements
-from zope.app.container.contained import Contained, setitem, uncontained
+from zope.container.contained import Contained, setitem, uncontained
 
 
 class SampleContainer(Contained):

src/zope/container/size.py

@@ -18,7 +18,7 @@ $Id$
 """
 __docformat__ = 'restructuredtext'
 
-from zope.app.container.i18n import ZopeMessageFactory as _
+from zope.container.i18n import ZopeMessageFactory as _
 from zope.size.interfaces import ISized
 from zope.interface import implements
 

src/zope/container/tests/placelesssetup.py

@@ -16,8 +16,8 @@
 $Id$
 """
 from zope.app.testing import ztapi
-from zope.app.container.interfaces import IWriteContainer, INameChooser
-from zope.app.container.contained import NameChooser
+from zope.container.interfaces import IWriteContainer, INameChooser
+from zope.container.contained import NameChooser
 
 class PlacelessSetup(object):
 

src/zope/container/tests/test_btree.py

@@ -20,8 +20,8 @@ from zope.interface.verify import verifyObject
 from zope.testing.doctestunit import DocTestSuite
 from zope.app.testing import placelesssetup
 from test_icontainer import TestSampleContainer
-from zope.app.container.btree import BTreeContainer
-from zope.app.container.interfaces import IBTreeContainer
+from zope.container.btree import BTreeContainer
+from zope.container.interfaces import IBTreeContainer
 
 
 class TestBTreeContainer(TestSampleContainer, TestCase):
@@ -168,7 +168,7 @@ def test_suite():
     return TestSuite((
         makeSuite(TestBTreeContainer),
         makeSuite(TestBTreeSpecials),
-        DocTestSuite('zope.app.container.btree',
+        DocTestSuite('zope.container.btree',
                      setUp=placelesssetup.setUp,
                      tearDown=placelesssetup.tearDown),
         ))

src/zope/container/tests/test_constraints.py

@@ -19,14 +19,14 @@ import unittest
 from zope.testing import doctest, module
 
 def setUp(test):
-    module.setUp(test, 'zope.app.container.constraints_txt')
+    module.setUp(test, 'zope.container.constraints_txt')
 
 def tearDown(test):
-    module.tearDown(test, 'zope.app.container.constraints_txt')
+    module.tearDown(test, 'zope.container.constraints_txt')
 
 def test_suite():
     return unittest.TestSuite((
-        doctest.DocTestSuite('zope.app.container.constraints'),
+        doctest.DocTestSuite('zope.container.constraints'),
         doctest.DocFileSuite('../constraints.txt',
                              setUp=setUp, tearDown=tearDown),
         ))

src/zope/container/tests/test_contained.py

@@ -25,7 +25,7 @@ from persistent import Persistent
 import zope.interface
 from zope.testing import doctest
 
-from zope.app.container.contained import ContainedProxy
+from zope.container.contained import ContainedProxy
 from zope.app.testing import placelesssetup
 
 class MyOb(Persistent):
@@ -108,24 +108,24 @@ def test_declarations_on_ContainedProxy():
     It implements IContained and IPersistent:
 
       >>> tuple(zope.interface.implementedBy(ContainedProxy))
-      (<InterfaceClass zope.app.container.interfaces.IContained>,
+      (<InterfaceClass zope.container.interfaces.IContained>,
        <InterfaceClass persistent.interfaces.IPersistent>)
 
     A proxied object has IContainer, in addition to what the unproxied
     object has:
 
       >>> tuple(zope.interface.providedBy(p))
-      (<InterfaceClass zope.app.container.tests.test_contained.I1>,
-       <InterfaceClass zope.app.container.interfaces.IContained>,
+      (<InterfaceClass zope.container.tests.test_contained.I1>,
+       <InterfaceClass zope.container.interfaces.IContained>,
        <InterfaceClass persistent.interfaces.IPersistent>)
 
       >>> class I2(zope.interface.Interface):
       ...     pass
       >>> zope.interface.directlyProvides(c, I2)
       >>> tuple(zope.interface.providedBy(p))
-      (<InterfaceClass zope.app.container.tests.test_contained.I2>,
-       <InterfaceClass zope.app.container.tests.test_contained.I1>,
-       <InterfaceClass zope.app.container.interfaces.IContained>,
+      (<InterfaceClass zope.container.tests.test_contained.I2>,
+       <InterfaceClass zope.container.tests.test_contained.I1>,
+       <InterfaceClass zope.container.interfaces.IContained>,
        <InterfaceClass persistent.interfaces.IPersistent>)
 
     We can declare interfaces through the proxy:
@@ -134,9 +134,9 @@ def test_declarations_on_ContainedProxy():
       ...     pass
       >>> zope.interface.directlyProvides(p, I3)
       >>> tuple(zope.interface.providedBy(p))
-      (<InterfaceClass zope.app.container.tests.test_contained.I3>,
-       <InterfaceClass zope.app.container.tests.test_contained.I1>,
-       <InterfaceClass zope.app.container.interfaces.IContained>,
+      (<InterfaceClass zope.container.tests.test_contained.I3>,
+       <InterfaceClass zope.container.tests.test_contained.I1>,
+       <InterfaceClass zope.container.interfaces.IContained>,
        <InterfaceClass persistent.interfaces.IPersistent>)
 
     """
@@ -293,7 +293,7 @@ def test_proxy_cache_interaction():
 def test_ContainedProxy_instances_have_no_instance_dictionaries():
     """Make sure that proxies don't introduce extra instance dictionaries
 
-    >>> from zope.app.container.contained import ContainedProxy
+    >>> from zope.container.contained import ContainedProxy
     >>> class C:
     ...     pass
 
@@ -318,7 +318,7 @@ def test_ContainedProxy_instances_have_no_instance_dictionaries():
 
 def test_suite():
     return unittest.TestSuite((
-        doctest.DocTestSuite('zope.app.container.contained',
+        doctest.DocTestSuite('zope.container.contained',
                              setUp=placelesssetup.setUp,
                              tearDown=placelesssetup.tearDown),
         doctest.DocTestSuite(optionflags=doctest.NORMALIZE_WHITESPACE),

src/zope/container/tests/test_containertraversable.py

@@ -20,8 +20,8 @@ from zope.testing.cleanup import CleanUp
 from zope.interface import implements
 from zope.traversing.interfaces import TraversalError
 
-from zope.app.container.traversal import ContainerTraversable
-from zope.app.container.interfaces import IContainer
+from zope.container.traversal import ContainerTraversable
+from zope.container.interfaces import IContainer
 
 class Container(object):
 

src/zope/container/tests/test_containertraverser.py

@@ -16,8 +16,8 @@
 $Id$
 """
 import unittest
-from zope.app.container.traversal import ContainerTraverser
-from zope.app.container.interfaces import IReadContainer
+from zope.container.traversal import ContainerTraverser
+from zope.container.interfaces import IReadContainer
 from zope.app.testing import ztapi, placelesssetup
 from zope.publisher.interfaces import NotFound
 from zope.publisher.browser import TestRequest

src/zope/container/tests/test_dependency.py

@@ -19,8 +19,8 @@ import unittest
 
 from zope.interface import implements
 from zope.app.dependable.interfaces import IDependable, DependencyError
-from zope.app.container.contained import ObjectRemovedEvent
-from zope.app.container.dependency import CheckDependency
+from zope.container.contained import ObjectRemovedEvent
+from zope.container.dependency import CheckDependency
 from zope.traversing.interfaces import IPhysicallyLocatable
 
 class DummyObject(object):

src/zope/container/tests/test_directory.py

@@ -16,7 +16,7 @@
 $Id$
 """
 from unittest import TestCase, TestSuite, main, makeSuite
-import zope.app.container.directory
+import zope.container.directory
 
 class Directory(object):
     pass
@@ -26,7 +26,7 @@ class Test(TestCase):
     def test_Cloner(self):
         d = Directory()
         d.a = 1
-        clone = zope.app.container.directory.Cloner(d)('foo')
+        clone = zope.container.directory.Cloner(d)('foo')
         self.assert_(clone != d)
         self.assertEqual(clone.__class__, d.__class__)
 

src/zope/container/tests/test_find.py

@@ -16,10 +16,10 @@
 $Id$
 """
 from unittest import TestCase, main, makeSuite
-from zope.app.container.interfaces import IReadContainer
-from zope.app.container.interfaces import IObjectFindFilter
-from zope.app.container.find import FindAdapter, SimpleIdFindFilter
-from zope.app.container.find import SimpleInterfacesFindFilter
+from zope.container.interfaces import IReadContainer
+from zope.container.interfaces import IObjectFindFilter
+from zope.container.find import FindAdapter, SimpleIdFindFilter
+from zope.container.find import SimpleInterfacesFindFilter
 from zope.interface import implements, Interface, directlyProvides
 
 class FakeContainer(object):

src/zope/container/tests/test_icontainer.py

@@ -18,7 +18,7 @@ $Id$
 from unittest import TestCase, main, makeSuite
 
 from zope.interface.verify import verifyObject
-from zope.app.container.interfaces import IContainer
+from zope.container.interfaces import IContainer
 from zope.app.testing import placelesssetup
 
 
@@ -300,7 +300,7 @@ class BaseTestIContainer(placelesssetup.PlacelessSetup):
 class TestSampleContainer(BaseTestIContainer, TestCase):
 
     def makeTestObject(self):
-        from zope.app.container.sample import SampleContainer
+        from zope.container.sample import SampleContainer
         return SampleContainer()
 
     def makeTestData(self):

src/zope/container/tests/test_ordered.py

@@ -28,7 +28,7 @@ def test_order_events():
 
     Prepare some objects::
 
-        >>> from zope.app.container.ordered import OrderedContainer
+        >>> from zope.container.ordered import OrderedContainer
         >>> oc = OrderedContainer()
         >>> oc['foo'] = 'bar'
         >>> oc['baz'] = 'quux'
@@ -69,7 +69,7 @@ def test_all_items_available_at_object_added_event():
     Now register an event subscriber to object added events.
 
         >>> import zope.component
-        >>> from zope.app.container import interfaces
+        >>> from zope.container import interfaces
 
         >>> @zope.component.adapter(interfaces.IObjectAddedEvent)
         ... def printContainerKeys(event):
@@ -79,7 +79,7 @@ def test_all_items_available_at_object_added_event():
 
     Now we are adding an object to the container. 
 
-        >>> from zope.app.container.ordered import OrderedContainer
+        >>> from zope.container.ordered import OrderedContainer
         >>> oc = OrderedContainer()
         >>> oc['foo'] = 'FOO'
         ['foo']
@@ -99,7 +99,7 @@ def test_exception_causes_order_fix():
     throws an error.
 
         >>> import zope.component
-        >>> from zope.app.container import interfaces
+        >>> from zope.container import interfaces
 
         >>> @zope.component.adapter(interfaces.IObjectAddedEvent)
         ... def raiseException(event):
@@ -109,7 +109,7 @@ def test_exception_causes_order_fix():
 
     Now we are adding an object to the container.
 
-        >>> from zope.app.container.ordered import OrderedContainer
+        >>> from zope.container.ordered import OrderedContainer
         >>> oc = OrderedContainer()
         >>> oc['foo'] = 'FOO'
         Traceback (most recent call last):
@@ -128,7 +128,7 @@ def test_exception_causes_order_fix():
 
 def test_suite():
     suite = unittest.TestSuite()
-    suite.addTest(DocTestSuite("zope.app.container.ordered",
+    suite.addTest(DocTestSuite("zope.container.ordered",
                                setUp=placelesssetup.setUp,
                                tearDown=placelesssetup.tearDown))
     suite.addTest(DocTestSuite())

src/zope/container/tests/test_size.py

@@ -19,7 +19,7 @@ import unittest
 
 from zope.interface import implements
 from zope.size.interfaces import ISized
-from zope.app.container.interfaces import IContainer
+from zope.container.interfaces import IContainer
 
 class DummyContainer(object):
 
@@ -35,12 +35,12 @@ class DummyContainer(object):
 class Test(unittest.TestCase):
 
     def testImplementsISized(self):
-        from zope.app.container.size import ContainerSized
+        from zope.container.size import ContainerSized
         sized = ContainerSized(DummyContainer(23))
         self.assert_(ISized.providedBy(sized))
 
     def testEmptyContainer(self):
-        from zope.app.container.size import ContainerSized
+        from zope.container.size import ContainerSized
         obj = DummyContainer(0)
         sized = ContainerSized(obj)
         self.assertEqual(sized.sizeForSorting(), ('item', 0))
@@ -48,14 +48,14 @@ class Test(unittest.TestCase):
         self.assertEqual(sized.sizeForDisplay().mapping['items'], '0')
 
     def testOneItem(self):
-        from zope.app.container.size import ContainerSized
+        from zope.container.size import ContainerSized
         obj = DummyContainer(1)
         sized = ContainerSized(obj)
         self.assertEqual(sized.sizeForSorting(), ('item', 1))
         self.assertEqual(sized.sizeForDisplay(), u'1 item')
 
     def testSeveralItems(self):
-        from zope.app.container.size import ContainerSized
+        from zope.container.size import ContainerSized
         obj = DummyContainer(2)
         sized = ContainerSized(obj)
         self.assertEqual(sized.sizeForSorting(), ('item', 2))

src/zope/container/traversal.py

@@ -24,8 +24,8 @@ from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.publisher.interfaces.xmlrpc import IXMLRPCPublisher
 from zope.publisher.interfaces import NotFound
 
-from zope.app.container.interfaces import ISimpleReadContainer, IItemContainer
-from zope.app.container.interfaces import IReadContainer
+from zope.container.interfaces import ISimpleReadContainer, IItemContainer
+from zope.container.interfaces import IReadContainer
 from zope.app.publisher.browser import getDefaultViewName
 
 # Note that the next two classes are included here because they