[Zope3-checkins] CVS: Zope3/src/zope/app/startup/tests - test_registerrequestfactory.py:1.6.10.1 test_requestfactoryregistry.py:1.3.16.1 test_servertyperegistry.py:1.3.16.1 test_simpleregistry.py:1.3.16.1

[Grégoire Weber]

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

Modified Files:
      Tag: cw-mail-branch
	test_registerrequestfactory.py test_requestfactoryregistry.py 
	test_servertyperegistry.py test_simpleregistry.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/app/startup/tests/test_registerrequestfactory.py 1.6 => 1.6.10.1 ===
--- Zope3/src/zope/app/startup/tests/test_registerrequestfactory.py:1.6	Thu May  1 15:35:37 2003
+++ Zope3/src/zope/app/startup/tests/test_registerrequestfactory.py	Sun Jun 22 10:23:32 2003
@@ -22,10 +22,11 @@
 from zope.app.startup.requestfactoryregistry import getRequestFactory
 from zope.testing.cleanup import CleanUp
 from zope.app.interfaces.startup import IPublicationRequestFactoryFactory
+from zope.interface import implements
 
 class TF:
     "test request factory"
-    __implements__ = IPublicationRequestFactoryFactory
+    implements(IPublicationRequestFactoryFactory)
 
 tf = TF()
 


=== Zope3/src/zope/app/startup/tests/test_requestfactoryregistry.py 1.3 => 1.3.16.1 ===
--- Zope3/src/zope/app/startup/tests/test_requestfactoryregistry.py:1.3	Thu Mar 13 13:49:10 2003
+++ Zope3/src/zope/app/startup/tests/test_requestfactoryregistry.py	Sun Jun 22 10:23:32 2003
@@ -22,13 +22,13 @@
 from zope.app.startup.requestfactoryregistry import \
      registerRequestFactory, getRequestFactory
 from zope.app.startup.requestfactory import IRequestFactory
+from zope.interface import implements
 
 
 class RequestFactory:
     """RequestFactory Stub."""
 
-    __implements__ = IRequestFactory
-
+    implements(IRequestFactory)
 
 
 class Test(unittest.TestCase):


=== Zope3/src/zope/app/startup/tests/test_servertyperegistry.py 1.3 => 1.3.16.1 ===
--- Zope3/src/zope/app/startup/tests/test_servertyperegistry.py:1.3	Thu Mar 13 13:49:10 2003
+++ Zope3/src/zope/app/startup/tests/test_servertyperegistry.py	Sun Jun 22 10:23:32 2003
@@ -22,13 +22,13 @@
 from zope.app.startup.servertyperegistry import \
      registerServerType, getServerType
 from zope.app.startup.servertype import IServerType
+from zope.interface import implements
 
 
 class ServerType:
     """ServerType Stub."""
 
-    __implements__ = IServerType
-
+    implements(IServerType)
 
 
 class Test(unittest.TestCase):


=== Zope3/src/zope/app/startup/tests/test_simpleregistry.py 1.3 => 1.3.16.1 ===
--- Zope3/src/zope/app/startup/tests/test_simpleregistry.py:1.3	Thu Mar 13 13:49:10 2003
+++ Zope3/src/zope/app/startup/tests/test_simpleregistry.py	Sun Jun 22 10:23:32 2003
@@ -20,6 +20,7 @@
 from zope.interface import Interface
 from zope.app.startup.simpleregistry import SimpleRegistry, \
      ZopeDuplicateRegistryEntryError, ZopeIllegalInterfaceError
+from zope.interface import implements
 
 
 class I1(Interface):
@@ -31,11 +32,11 @@
 
 
 class Object1:
-    __implements__ = I1
+    implements(I1)
 
 
 class Object2:
-    __implements__ = I2
+    implements(I2)
 
 
 class Test(unittest.TestCase):