[Zope3-checkins] CVS: Zope3/src/zope/app/http - delete.py:1.1.18.1 options.py:1.1.2.1 put.py:1.5.2.1 traversal.py:1.2.16.1

[Grégoire Weber]

Update of /cvs-repository/Zope3/src/zope/app/http
In directory cvs.zope.org:/tmp/cvs-serv24874/src/zope/app/http

Modified Files:
      Tag: cw-mail-branch
	delete.py options.py put.py traversal.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/app/http/delete.py 1.1 => 1.1.18.1 ===
--- Zope3/src/zope/app/http/delete.py:1.1	Fri Feb 28 17:34:28 2003
+++ Zope3/src/zope/app/http/delete.py	Sun Jun 22 10:23:06 2003
@@ -18,7 +18,7 @@
 __metaclass__ = type
 
 from zope.component import getAdapter
-from zope.proxy.context import getWrapperContainer, getWrapperData
+from zope.context import getWrapperContainer, getWrapperData
 from zope.app.interfaces.file import IWriteDirectory
 from zope.app.interfaces.container import IZopeWriteContainer
 


=== Zope3/src/zope/app/http/options.py 1.1 => 1.1.2.1 ===
--- Zope3/src/zope/app/http/options.py:1.1	Tue May 20 15:43:27 2003
+++ Zope3/src/zope/app/http/options.py	Sun Jun 22 10:23:06 2003
@@ -20,7 +20,7 @@
            'COPY', 'MOVE', 'LOCK', 'UNLOCK', 'TRACE']
            # XXX 'GET', 'HEAD', 'POST' are always available?
 
-from zope.component import getAdapter, queryView
+from zope.component import queryView
 
 class OPTIONS:
     """OPTIONS handler for all objects


=== Zope3/src/zope/app/http/put.py 1.5 => 1.5.2.1 ===
--- Zope3/src/zope/app/http/put.py:1.5	Wed May 21 16:29:11 2003
+++ Zope3/src/zope/app/http/put.py	Sun Jun 22 10:23:06 2003
@@ -23,12 +23,13 @@
 from zope.app.interfaces.container import IZopeWriteContainer
 from zope.app.event import publish
 from zope.app.event.objectevent import ObjectCreatedEvent
+from zope.interface import implements
 
 class NullResource:
     """Object representing objects to be created by a PUT.
     """
 
-    __implements__ = INullResource
+    implements(INullResource)
 
     def __init__(self, container, name):
         self.container = container


=== Zope3/src/zope/app/http/traversal.py 1.2 => 1.2.16.1 ===
--- Zope3/src/zope/app/http/traversal.py:1.2	Sat Mar 29 12:03:58 2003
+++ Zope3/src/zope/app/http/traversal.py	Sun Jun 22 10:23:06 2003
@@ -22,10 +22,11 @@
 from zope.app.interfaces.container import ISimpleReadContainer, IItemContainer
 from zope.app.http.put import NullResource
 from zope.exceptions import NotFoundError
+from zope.interface import implements
 
 class ContainerTraverser:
-    
-    __implements__ = IPublishTraverse
+
+    implements(IPublishTraverse)
     __used_for__ = ISimpleReadContainer
 
     def __init__(self, container, request):