[Zope3-checkins] CVS: Zope3/src/zope/app/http/tests - test_delete.py:1.2.10.1 test_put.py:1.3.10.1

Grégoire Weber zope@i-con.ch
Sun, 22 Jun 2003 10:24:08 -0400


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

Modified Files:
      Tag: cw-mail-branch
	test_delete.py test_put.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/app/http/tests/test_delete.py 1.2 => 1.2.10.1 ===
--- Zope3/src/zope/app/http/tests/test_delete.py:1.2	Thu May  1 15:35:17 2003
+++ Zope3/src/zope/app/http/tests/test_delete.py	Sun Jun 22 10:23:07 2003
@@ -22,15 +22,16 @@
 from zope.app.interfaces.file import IWriteDirectory, IFileFactory
 from zope.app.interfaces.container import IZopeWriteContainer
 from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.proxy.context import ContextWrapper
+from zope.app.context import ContextWrapper
+from zope.interface import implements
 
 class Container:
 
-    __implements__ = IWriteDirectory, IZopeWriteContainer, IFileFactory
+    implements(IWriteDirectory, IZopeWriteContainer, IFileFactory)
 
     def __delitem__(self, name):
         delattr(self, name)
-        
+
 
 class TestDelete(PlacelessSetup, TestCase):
 
@@ -38,7 +39,7 @@
         container = Container()
         container.a = 'spam'
         item = ContextWrapper(Container(), container, name='a')
-        
+
         request = TestRequest()
         delete = zope.app.http.delete.DELETE(item, request)
         self.assert_(hasattr(container, 'a'))        


=== Zope3/src/zope/app/http/tests/test_put.py 1.3 => 1.3.10.1 ===
--- Zope3/src/zope/app/http/tests/test_put.py:1.3	Thu May  1 15:35:17 2003
+++ Zope3/src/zope/app/http/tests/test_put.py	Sun Jun 22 10:23:07 2003
@@ -23,10 +23,11 @@
 from zope.app.interfaces.file import IWriteFile, IWriteDirectory, IFileFactory
 from zope.app.interfaces.container import IZopeWriteContainer
 from zope.app.tests.placelesssetup import PlacelessSetup
+from zope.interface import implements
 
 class File:
 
-    __implements__ = IWriteFile
+    implements(IWriteFile)
 
     def __init__(self, name, content_type, data):
         self.name = name
@@ -38,7 +39,7 @@
 
 class Container:
 
-    __implements__ = IWriteDirectory, IZopeWriteContainer, IFileFactory
+    implements(IWriteDirectory, IZopeWriteContainer, IFileFactory)
 
     def setObject(self, name, object):
         setattr(self, name, object)