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

[Wolfgang Schnerring]

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

Changed:
  U   zope.site/trunk/CHANGES.txt
  U   zope.site/trunk/setup.py
  U   zope.site/trunk/src/zope/site/configure.zcml
  U   zope.site/trunk/src/zope/site/interfaces.py
  U   zope.site/trunk/src/zope/site/site.py
  U   zope.site/trunk/src/zope/site/site.txt
  U   zope.site/trunk/src/zope/site/tests/test_registration.py

-=-
Modified: zope.site/trunk/CHANGES.txt
===================================================================
--- zope.site/trunk/CHANGES.txt	2009-01-29 18:05:55 UTC (rev 95464)
+++ zope.site/trunk/CHANGES.txt	2009-01-29 18:10:06 UTC (rev 95465)
@@ -5,7 +5,7 @@
 3.5.2 (unreleased)
 ------------------
 
-- ...
+- Use zope.container instead of zope.app.container.
 
 3.5.1 (2009-01-27)
 ------------------

Modified: zope.site/trunk/setup.py
===================================================================
--- zope.site/trunk/setup.py	2009-01-29 18:05:55 UTC (rev 95464)
+++ zope.site/trunk/setup.py	2009-01-29 18:10:06 UTC (rev 95465)
@@ -59,7 +59,7 @@
       install_requires=[
           'setuptools',
           'zope.annotation',
-          'zope.app.container',
+          'zope.container',
           'zope.security',
           'zope.component [hook]',
           'zope.configuration',

Modified: zope.site/trunk/src/zope/site/configure.zcml
===================================================================
--- zope.site/trunk/src/zope/site/configure.zcml	2009-01-29 18:05:55 UTC (rev 95464)
+++ zope.site/trunk/src/zope/site/configure.zcml	2009-01-29 18:10:06 UTC (rev 95465)
@@ -13,11 +13,11 @@
         interface="zope.annotation.interfaces.IAttributeAnnotatable" />
     <require
         permission="zope.ManageSite"
-        interface="zope.app.container.interfaces.IReadContainer" />
+        interface="zope.container.interfaces.IReadContainer" />
     <require
         permission="zope.ManageSite"
         interface="zope.component.interfaces.IComponentLookup
-                   zope.app.container.interfaces.IWriteContainer" />
+                   zope.container.interfaces.IWriteContainer" />
   </class>
 
   <class class="zope.component.registry.UtilityRegistration">    
@@ -34,10 +34,10 @@
         />
     <require
         permission="zope.ManageSite"
-        interface="zope.app.container.interfaces.IReadContainer" />
+        interface="zope.container.interfaces.IReadContainer" />
     <require
         permission="zope.ManageSite"
-        interface="zope.app.container.interfaces.IWriteContainer"
+        interface="zope.container.interfaces.IWriteContainer"
         />
   </class>
   
@@ -63,7 +63,7 @@
 
   <subscriber
       for="zope.location.interfaces.ISite
-           zope.app.container.interfaces.IObjectMovedEvent"
+           zope.container.interfaces.IObjectMovedEvent"
       handler=".site.changeSiteConfigurationAfterMove"
       />
 

Modified: zope.site/trunk/src/zope/site/interfaces.py
===================================================================
--- zope.site/trunk/src/zope/site/interfaces.py	2009-01-29 18:05:55 UTC (rev 95464)
+++ zope.site/trunk/src/zope/site/interfaces.py	2009-01-29 18:10:06 UTC (rev 95465)
@@ -18,7 +18,7 @@
 
 import zope.interface
 import zope.component.interfaces
-import zope.app.container.interfaces
+import zope.container.interfaces
                     
 class INewLocalSite(zope.interface.Interface):
     """Event: a local site was created
@@ -68,10 +68,10 @@
         """
     
 
-class ISiteManagementFolder(zope.app.container.interfaces.IContainer):
+class ISiteManagementFolder(zope.container.interfaces.IContainer):
     """Component and component registration containers."""
 
     # XXX we need to figure out how to constrain this or, alternatively,
     # just use regular folders, which is probably the beter choice.
-    # zope.app.container.constraints.containers(ILocalSiteManager)
+    # zope.container.constraints.containers(ILocalSiteManager)
 

Modified: zope.site/trunk/src/zope/site/site.py
===================================================================
--- zope.site/trunk/src/zope/site/site.py	2009-01-29 18:05:55 UTC (rev 95464)
+++ zope.site/trunk/src/zope/site/site.py	2009-01-29 18:10:06 UTC (rev 95465)
@@ -38,8 +38,8 @@
 from zope.lifecycleevent import ObjectCreatedEvent
 from zope.filerepresentation.interfaces import IDirectoryFactory
 
-from zope.app.container.btree import BTreeContainer
-from zope.app.container.contained import Contained
+from zope.container.btree import BTreeContainer
+from zope.container.contained import Contained
 
 from zope.site import interfaces
 from zope.site.hooks import setSite

Modified: zope.site/trunk/src/zope/site/site.txt
===================================================================
--- zope.site/trunk/src/zope/site/site.txt	2009-01-29 18:05:55 UTC (rev 95464)
+++ zope.site/trunk/src/zope/site/site.txt	2009-01-29 18:10:06 UTC (rev 95465)
@@ -130,7 +130,7 @@
   ...     pass
 
   >>> import persistent
-  >>> from zope.app.container.contained import Contained
+  >>> from zope.container.contained import Contained
   >>> class MyUtility(persistent.Persistent, Contained):
   ...     zope.interface.implements(IMyUtility)
   ...     def __init__(self, title):

Modified: zope.site/trunk/src/zope/site/tests/test_registration.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_registration.py	2009-01-29 18:05:55 UTC (rev 95464)
+++ zope.site/trunk/src/zope/site/tests/test_registration.py	2009-01-29 18:10:06 UTC (rev 95465)
@@ -31,7 +31,7 @@
 import zope.component.testing as placelesssetup
 from zope.testing import doctest
 from zope.app.testing import setup
-import zope.app.container.contained
+import zope.container.contained
 from zope import interface
 
 import zope.site
@@ -40,7 +40,7 @@
 # test class for testing data conversion
 class IFoo(interface.Interface):
     pass
-class Foo(persistent.Persistent, zope.app.container.contained.Contained):
+class Foo(persistent.Persistent, zope.container.contained.Contained):
     interface.implements(IFoo)
     name = ''
     def __init__(self, name=''):