[Checkins] SVN: zope.app.http/trunk/ Switch to zope.container from zope.app.container.

[Martijn Faassen]

Log message for revision 95484:
  Switch to zope.container from zope.app.container.
  

Changed:
  U   zope.app.http/trunk/CHANGES.txt
  U   zope.app.http/trunk/setup.py
  U   zope.app.http/trunk/src/zope/app/http/configure.zcml
  U   zope.app.http/trunk/src/zope/app/http/tests/test_delete.py
  U   zope.app.http/trunk/src/zope/app/http/traversal.py

-=-
Modified: zope.app.http/trunk/CHANGES.txt
===================================================================
--- zope.app.http/trunk/CHANGES.txt	2009-01-29 18:28:08 UTC (rev 95483)
+++ zope.app.http/trunk/CHANGES.txt	2009-01-29 18:32:36 UTC (rev 95484)
@@ -2,10 +2,10 @@
 CHANGES
 =======
 
-3.4.5 (unreleased)
-------------------
+3.5 (unreleased)
+----------------
 
-- ...
+- Change dependency on zope.app.container to zope.container.
 
 3.4.4 (2009-01-29)
 ------------------

Modified: zope.app.http/trunk/setup.py
===================================================================
--- zope.app.http/trunk/setup.py	2009-01-29 18:28:08 UTC (rev 95483)
+++ zope.app.http/trunk/setup.py	2009-01-29 18:32:36 UTC (rev 95484)
@@ -55,7 +55,7 @@
       install_requires=['setuptools',
                         'zope.interface',
                         'zope.publisher',
-                        'zope.app.container',
+                        'zope.container',
                         'zope.app.publication',
                         'zope.filerepresentation',
                         ],

Modified: zope.app.http/trunk/src/zope/app/http/configure.zcml
===================================================================
--- zope.app.http/trunk/src/zope/app/http/configure.zcml	2009-01-29 18:28:08 UTC (rev 95483)
+++ zope.app.http/trunk/src/zope/app/http/configure.zcml	2009-01-29 18:32:36 UTC (rev 95484)
@@ -5,7 +5,7 @@
 </class>
 
 <view
-  for="zope.app.container.interfaces.ISimpleReadContainer"
+  for="zope.container.interfaces.ISimpleReadContainer"
   type="zope.publisher.interfaces.http.IHTTPRequest"
   provides="zope.publisher.interfaces.IPublishTraverse"
   factory=".traversal.ContainerTraverser"
@@ -14,7 +14,7 @@
   />
 
 <view
-    for="zope.app.container.interfaces.IItemContainer"
+    for="zope.container.interfaces.IItemContainer"
     type="zope.publisher.interfaces.http.IHTTPRequest"
     provides="zope.publisher.interfaces.http.IHTTPPublisher"
     factory=".traversal.ItemTraverser"

Modified: zope.app.http/trunk/src/zope/app/http/tests/test_delete.py
===================================================================
--- zope.app.http/trunk/src/zope/app/http/tests/test_delete.py	2009-01-29 18:28:08 UTC (rev 95483)
+++ zope.app.http/trunk/src/zope/app/http/tests/test_delete.py	2009-01-29 18:32:36 UTC (rev 95484)
@@ -23,7 +23,7 @@
 
 import zope.app.http.delete
 from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.app.container.contained import contained
+from zope.container.contained import contained
 from zope.app.publication.http import MethodNotAllowed
 
 class UnwritableContainer(object):

Modified: zope.app.http/trunk/src/zope/app/http/traversal.py
===================================================================
--- zope.app.http/trunk/src/zope/app/http/traversal.py	2009-01-29 18:28:08 UTC (rev 95483)
+++ zope.app.http/trunk/src/zope/app/http/traversal.py	2009-01-29 18:32:36 UTC (rev 95484)
@@ -19,7 +19,7 @@
 __docformat__ = 'restructuredtext'
 
 from zope.publisher.interfaces.http import IHTTPPublisher
-from zope.app.container.interfaces import ISimpleReadContainer, IItemContainer
+from zope.container.interfaces import ISimpleReadContainer, IItemContainer
 from zope.app.http.put import NullResource
 from zope.publisher.interfaces import NotFound
 from zope.interface import implements