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

[Wolfgang Schnerring]

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

Changed:
  U   zope.app.folder/trunk/CHANGES.txt
  U   zope.app.folder/trunk/setup.py
  U   zope.app.folder/trunk/src/zope/app/folder/configure.zcml
  U   zope.app.folder/trunk/src/zope/app/folder/folder.py
  U   zope.app.folder/trunk/src/zope/app/folder/interfaces.py

-=-
Modified: zope.app.folder/trunk/CHANGES.txt
===================================================================
--- zope.app.folder/trunk/CHANGES.txt	2009-01-29 16:02:24 UTC (rev 95445)
+++ zope.app.folder/trunk/CHANGES.txt	2009-01-29 16:25:56 UTC (rev 95446)
@@ -6,6 +6,7 @@
 
 - Import IPossibleSite from zope.location.interfaces
   instead of deprecated place in zope.app.component.interfaces.
+- Use zope.container instead of zope.app.container.
 
 3.4.0 (2007-10-24)
 ------------------

Modified: zope.app.folder/trunk/setup.py
===================================================================
--- zope.app.folder/trunk/setup.py	2009-01-29 16:02:24 UTC (rev 95445)
+++ zope.app.folder/trunk/setup.py	2009-01-29 16:25:56 UTC (rev 95446)
@@ -55,6 +55,7 @@
       extras_require=dict(test=['zope.app.testing',
                                 'zope.app.zcmlfiles']),
       install_requires=['setuptools',
+                        'zope.container',
                         'zope.datetime',
                         'zope.dublincore',
                         'zope.event',
@@ -64,7 +65,6 @@
                         'zope.traversing',
                         'zope.app.authentication',
                         'zope.app.component',
-                        'zope.app.container',
                         'zope.app.security',
                         'ZODB3',
                         ],

Modified: zope.app.folder/trunk/src/zope/app/folder/configure.zcml
===================================================================
--- zope.app.folder/trunk/src/zope/app/folder/configure.zcml	2009-01-29 16:02:24 UTC (rev 95445)
+++ zope.app.folder/trunk/src/zope/app/folder/configure.zcml	2009-01-29 16:25:56 UTC (rev 95446)
@@ -23,18 +23,18 @@
         />
     <require
         permission="zope.View"
-        interface="zope.app.container.interfaces.IReadContainer" 
+        interface="zope.container.interfaces.IReadContainer" 
         />
     <require
         permission="zope.ManageContent"
-        interface="zope.app.container.interfaces.IWriteContainer"
+        interface="zope.container.interfaces.IWriteContainer"
         />
   </class>
 
   <adapter
       for=".interfaces.IFolder"
       provides="zope.filerepresentation.interfaces.IDirectoryFactory"
-      factory="zope.app.container.directory.Cloner"
+      factory="zope.container.directory.Cloner"
       permission="zope.ManageContent"
       />
 

Modified: zope.app.folder/trunk/src/zope/app/folder/folder.py
===================================================================
--- zope.app.folder/trunk/src/zope/app/folder/folder.py	2009-01-29 16:02:24 UTC (rev 95445)
+++ zope.app.folder/trunk/src/zope/app/folder/folder.py	2009-01-29 16:25:56 UTC (rev 95446)
@@ -20,7 +20,7 @@
 from BTrees.OOBTree import OOBTree
 from interfaces import IFolder, IRootFolder
 from persistent import Persistent
-from zope.app.container.contained import Contained, setitem, uncontained
+from zope.container.contained import Contained, setitem, uncontained
 from zope.app.component.interfaces import ISite
 from zope.app.component.site import SiteManagerContainer
 from zope.exceptions import DuplicationError

Modified: zope.app.folder/trunk/src/zope/app/folder/interfaces.py
===================================================================
--- zope.app.folder/trunk/src/zope/app/folder/interfaces.py	2009-01-29 16:02:24 UTC (rev 95445)
+++ zope.app.folder/trunk/src/zope/app/folder/interfaces.py	2009-01-29 16:25:56 UTC (rev 95446)
@@ -19,7 +19,7 @@
 
 from zope.traversing.interfaces import IContainmentRoot
 from zope.annotation.interfaces import IAttributeAnnotatable
-from zope.app.container.interfaces import IContainer
+from zope.container.interfaces import IContainer
 from zope.location.interfaces import IPossibleSite
 
 class IFolder(IContainer, IPossibleSite, IAttributeAnnotatable):