[Checkins] SVN: zope.app.http/trunk/ Moved IMethodNotAllowed and MethodNotAllowed from zope.app.http to

[Shane Hathaway]

Log message for revision 100271:
  Moved IMethodNotAllowed and MethodNotAllowed from zope.app.http to
  zope.publisher.interfaces.http, fixing dependency cycles involving
  zope.app.http.
  

Changed:
  U   zope.app.http/trunk/CHANGES.txt
  U   zope.app.http/trunk/setup.py
  U   zope.app.http/trunk/src/zope/app/http/delete.py
  U   zope.app.http/trunk/src/zope/app/http/exception/configure.zcml
  U   zope.app.http/trunk/src/zope/app/http/exception/methodnotallowed.py
  U   zope.app.http/trunk/src/zope/app/http/exception/tests/test_methodnotallowed.py
  U   zope.app.http/trunk/src/zope/app/http/tests/test_delete.py

-=-
Modified: zope.app.http/trunk/CHANGES.txt
===================================================================
--- zope.app.http/trunk/CHANGES.txt	2009-05-23 01:38:43 UTC (rev 100270)
+++ zope.app.http/trunk/CHANGES.txt	2009-05-23 01:49:25 UTC (rev 100271)
@@ -2,10 +2,12 @@
 CHANGES
 =======
 
-3.5.3 (unreleased)
+3.6.0 (unreleased)
 ------------------
 
-- ...
+- Moved IMethodNotAllowed and MethodNotAllowed from zope.app.http to
+  zope.publisher.interfaces.http, fixing dependency cycles involving
+  zope.app.http.
 
 3.5.2 (2009-04-01)
 ------------------

Modified: zope.app.http/trunk/setup.py
===================================================================
--- zope.app.http/trunk/setup.py	2009-05-23 01:38:43 UTC (rev 100270)
+++ zope.app.http/trunk/setup.py	2009-05-23 01:49:25 UTC (rev 100271)
@@ -22,7 +22,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.app.http',
-      version='3.5.3dev',
+      version='3.6.0',
       author='Zope Corporation and Contributors',
       author_email='zope-dev at zope.org',
       description='HTTP Behavior for the Zope Publisher',
@@ -54,9 +54,8 @@
                 'zope.app.zcmlfiles']),
       install_requires=['setuptools',
                         'zope.interface',
-                        'zope.publisher',
+                        'zope.publisher>=3.8.0',
                         'zope.container',
-                        'zope.app.publication',
                         'zope.filerepresentation',
                         ],
       include_package_data=True,

Modified: zope.app.http/trunk/src/zope/app/http/delete.py
===================================================================
--- zope.app.http/trunk/src/zope/app/http/delete.py	2009-05-23 01:38:43 UTC (rev 100270)
+++ zope.app.http/trunk/src/zope/app/http/delete.py	2009-05-23 01:49:25 UTC (rev 100271)
@@ -16,7 +16,7 @@
 __docformat__ = 'restructuredtext'
 
 from zope.filerepresentation.interfaces import IWriteDirectory
-from zope.app.publication.http import MethodNotAllowed
+from zope.publisher.interfaces.http import MethodNotAllowed
 
 
 class DELETE(object):

Modified: zope.app.http/trunk/src/zope/app/http/exception/configure.zcml
===================================================================
--- zope.app.http/trunk/src/zope/app/http/exception/configure.zcml	2009-05-23 01:38:43 UTC (rev 100270)
+++ zope.app.http/trunk/src/zope/app/http/exception/configure.zcml	2009-05-23 01:49:25 UTC (rev 100271)
@@ -31,7 +31,7 @@
     />
 
 <view
-    for="zope.app.publication.http.IMethodNotAllowed"
+    for="zope.publisher.interfaces.http.IMethodNotAllowed"
     factory="zope.app.http.exception.methodnotallowed.MethodNotAllowedView"
     name="index.html"
     type="zope.publisher.interfaces.http.IHTTPRequest"
@@ -39,7 +39,7 @@
     />
 
 <browser:defaultView
-    for="zope.app.publication.http.IMethodNotAllowed"
+    for="zope.publisher.interfaces.http.IMethodNotAllowed"
     layer="zope.publisher.interfaces.http.IHTTPRequest"
     name="index.html"
     />

Modified: zope.app.http/trunk/src/zope/app/http/exception/methodnotallowed.py
===================================================================
--- zope.app.http/trunk/src/zope/app/http/exception/methodnotallowed.py	2009-05-23 01:38:43 UTC (rev 100270)
+++ zope.app.http/trunk/src/zope/app/http/exception/methodnotallowed.py	2009-05-23 01:49:25 UTC (rev 100271)
@@ -15,7 +15,7 @@
 """
 from zope.component import getAdapters
 from zope.interface import Interface
-from zope.app.publication.http import IMethodNotAllowed
+from zope.publisher.interfaces.http import IMethodNotAllowed
 
 
 class MethodNotAllowedView(object):

Modified: zope.app.http/trunk/src/zope/app/http/exception/tests/test_methodnotallowed.py
===================================================================
--- zope.app.http/trunk/src/zope/app/http/exception/tests/test_methodnotallowed.py	2009-05-23 01:38:43 UTC (rev 100270)
+++ zope.app.http/trunk/src/zope/app/http/exception/tests/test_methodnotallowed.py	2009-05-23 01:49:25 UTC (rev 100271)
@@ -59,7 +59,7 @@
         ztapi.provideView(I, IHTTPRequest, Interface, 'also_irr.', DeleteView)
 
     def test(self):
-        from zope.app.publication.http import MethodNotAllowed
+        from zope.publisher.interfaces.http import MethodNotAllowed
         from zope.app.http.exception.methodnotallowed \
              import MethodNotAllowedView
         from zope.publisher.http import HTTPRequest

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-05-23 01:38:43 UTC (rev 100270)
+++ zope.app.http/trunk/src/zope/app/http/tests/test_delete.py	2009-05-23 01:49:25 UTC (rev 100271)
@@ -24,7 +24,7 @@
 import zope.app.http.delete
 from zope.app.testing.placelesssetup import PlacelessSetup
 from zope.container.contained import contained
-from zope.app.publication.http import MethodNotAllowed
+from zope.publisher.interfaces.http import MethodNotAllowed
 
 class UnwritableContainer(object):
     pass