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

[Wolfgang Schnerring]

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

Changed:
  U   zope.app.ftp/trunk/CHANGES.txt
  U   zope.app.ftp/trunk/setup.py
  U   zope.app.ftp/trunk/src/zope/app/ftp/__init__.py
  U   zope.app.ftp/trunk/src/zope/app/ftp/configure.zcml
  U   zope.app.ftp/trunk/src/zope/app/ftp/tests/test_ftpview.py

-=-
Modified: zope.app.ftp/trunk/CHANGES.txt
===================================================================
--- zope.app.ftp/trunk/CHANGES.txt	2009-01-29 18:03:32 UTC (rev 95462)
+++ zope.app.ftp/trunk/CHANGES.txt	2009-01-29 18:05:32 UTC (rev 95463)
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+3.4.1 (unreleased)
+==================
+
+- Use zope.container instead of zope.app.container.
+
 3.4.0 (2007-10-24)
 ==================
 

Modified: zope.app.ftp/trunk/setup.py
===================================================================
--- zope.app.ftp/trunk/setup.py	2009-01-29 18:03:32 UTC (rev 95462)
+++ zope.app.ftp/trunk/setup.py	2009-01-29 18:05:32 UTC (rev 95463)
@@ -54,7 +54,7 @@
       namespace_packages=['zope', 'zope.app'],
       extras_require = dict(test=['zope.app.testing',]),
       install_requires = ['setuptools',
-                          'zope.app.container',
+                          'zope.container',
                           'zope.component',
                           'zope.copypastemove',
                           'zope.dublincore',

Modified: zope.app.ftp/trunk/src/zope/app/ftp/__init__.py
===================================================================
--- zope.app.ftp/trunk/src/zope/app/ftp/__init__.py	2009-01-29 18:03:32 UTC (rev 95462)
+++ zope.app.ftp/trunk/src/zope/app/ftp/__init__.py	2009-01-29 18:05:32 UTC (rev 95463)
@@ -33,7 +33,7 @@
 from zope.filerepresentation.interfaces import IDirectoryFactory
 from zope.copypastemove.interfaces import IContainerItemRenamer
 
-from zope.app.container.interfaces import IContainer
+from zope.container.interfaces import IContainer
 
 class FTPView(object):
     implements(IFTPPublisher)

Modified: zope.app.ftp/trunk/src/zope/app/ftp/configure.zcml
===================================================================
--- zope.app.ftp/trunk/src/zope/app/ftp/configure.zcml	2009-01-29 18:03:32 UTC (rev 95462)
+++ zope.app.ftp/trunk/src/zope/app/ftp/configure.zcml	2009-01-29 18:05:32 UTC (rev 95463)
@@ -9,7 +9,7 @@
     -->
   
   <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       type="zope.publisher.interfaces.ftp.IFTPRequest"
       provides="zope.publisher.interfaces.ftp.IFTPPublisher"
       factory=".FTPView"
@@ -19,7 +19,7 @@
       />
 
   <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       name="type"
       type="zope.publisher.interfaces.ftp.IFTPRequest"
       factory=".FTPView"
@@ -29,7 +29,7 @@
       />
 
   <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       name="names"
       type="zope.publisher.interfaces.ftp.IFTPRequest"
       factory=".FTPView"
@@ -39,7 +39,7 @@
       />
 
   <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       name="ls"
       type="zope.publisher.interfaces.ftp.IFTPRequest"
       factory=".FTPView"
@@ -49,7 +49,7 @@
       />
 
   <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       name="readfile"
       type="zope.publisher.interfaces.ftp.IFTPRequest"
       factory=".FTPView"
@@ -59,7 +59,7 @@
       />
 
   <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       name="lsinfo"
       type="zope.publisher.interfaces.ftp.IFTPRequest"
       factory=".FTPView"
@@ -69,7 +69,7 @@
       />
 
   <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       name="mtime"
       type="zope.publisher.interfaces.ftp.IFTPRequest"
       factory=".FTPView"
@@ -79,7 +79,7 @@
       />
 
   <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       name="size"
       type="zope.publisher.interfaces.ftp.IFTPRequest"
       factory=".FTPView"
@@ -89,7 +89,7 @@
       />
 
   <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       name="mkdir"
       type="zope.publisher.interfaces.ftp.IFTPRequest"
       factory=".FTPView"
@@ -99,7 +99,7 @@
       />
 
   <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       name="remove"
       type="zope.publisher.interfaces.ftp.IFTPRequest"
       factory=".FTPView"
@@ -109,7 +109,7 @@
       />
 
   <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       name="rmdir"
       type="zope.publisher.interfaces.ftp.IFTPRequest"
       factory=".FTPView"
@@ -119,7 +119,7 @@
       />
 
   <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       name="rename"
       type="zope.publisher.interfaces.ftp.IFTPRequest"
       factory=".FTPView"
@@ -129,7 +129,7 @@
       />
 
   <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       name="writefile"
       type="zope.publisher.interfaces.ftp.IFTPRequest"
       factory=".FTPView"
@@ -139,7 +139,7 @@
       />
 
     <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       name="writable"
       type="zope.publisher.interfaces.ftp.IFTPRequest"
       factory=".FTPView"
@@ -149,7 +149,7 @@
       />
 
     <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       name="readable"
       type="zope.publisher.interfaces.ftp.IFTPRequest"
       factory=".FTPView"

Modified: zope.app.ftp/trunk/src/zope/app/ftp/tests/test_ftpview.py
===================================================================
--- zope.app.ftp/trunk/src/zope/app/ftp/tests/test_ftpview.py	2009-01-29 18:03:32 UTC (rev 95462)
+++ zope.app.ftp/trunk/src/zope/app/ftp/tests/test_ftpview.py	2009-01-29 18:05:32 UTC (rev 95463)
@@ -34,8 +34,8 @@
 from zope.app.testing import ztapi
 from zope.app.ftp import FTPView
 from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.app.container.contained import setitem, Contained
-from zope.app.container.interfaces import IContainer
+from zope.container.contained import setitem, Contained
+from zope.container.interfaces import IContainer
 
 import demofs