[Zope3-checkins] CVS: Zope3/src/zope/app/applicationcontrol - applicationcontrol.py:1.3.26.1 runtimeinfo.py:1.2.26.1 servercontrol.py:1.4.12.1 zopeversion.py:1.3.26.1

[Grégoire Weber]

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

Modified Files:
      Tag: cw-mail-branch
	applicationcontrol.py runtimeinfo.py servercontrol.py 
	zopeversion.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/app/applicationcontrol/applicationcontrol.py 1.3 => 1.3.26.1 ===
--- Zope3/src/zope/app/applicationcontrol/applicationcontrol.py:1.3	Mon Dec 30 16:41:57 2002
+++ Zope3/src/zope/app/applicationcontrol/applicationcontrol.py	Sun Jun 22 10:22:34 2003
@@ -19,12 +19,13 @@
      import IApplicationControl
 from zope.app.content.folder import RootFolder
 from zope.security.checker import ProxyFactory, NamesChecker
+from zope.interface import implements
 
 import time
 
 class ApplicationControl:
 
-    __implements__ = IApplicationControl
+    implements(IApplicationControl)
 
     def __init__(self):
         self.start_time = time.time()


=== Zope3/src/zope/app/applicationcontrol/runtimeinfo.py 1.2 => 1.2.26.1 ===
--- Zope3/src/zope/app/applicationcontrol/runtimeinfo.py:1.2	Wed Dec 25 09:12:25 2002
+++ Zope3/src/zope/app/applicationcontrol/runtimeinfo.py	Sun Jun 22 10:22:34 2003
@@ -16,14 +16,16 @@
 $Id$"""
 
 from zope.app.interfaces.applicationcontrol.runtimeinfo import IRuntimeInfo
-from zope.app.interfaces.applicationcontrol.applicationcontrol import IApplicationControl
+from zope.app.interfaces.applicationcontrol.applicationcontrol \
+    import IApplicationControl
 from zope.component import getUtility, ComponentLookupError
 from zope.app.interfaces.applicationcontrol.zopeversion import IZopeVersion
+from zope.interface import implements
 import sys, os, time
 
 class RuntimeInfo:
 
-    __implements__ =  IRuntimeInfo
+    implements(IRuntimeInfo)
     __used_for__ = IApplicationControl
 
     def __init__(self, context):


=== Zope3/src/zope/app/applicationcontrol/servercontrol.py 1.4 => 1.4.12.1 ===
--- Zope3/src/zope/app/applicationcontrol/servercontrol.py:1.4	Wed Apr 30 19:37:47 2003
+++ Zope3/src/zope/app/applicationcontrol/servercontrol.py	Sun Jun 22 10:22:34 2003
@@ -20,11 +20,11 @@
 
 from zope.app.interfaces.applicationcontrol.servercontrol import \
      IServerControl, DoublePriorityError, NotCallableError
-
+from zope.interface import implements
 
 class ServerControl:
 
-    __implements__ = IServerControl
+    implements(IServerControl)
 
     def __init__(self):
         # This is the actual shutdown registry.  It will hold the hooks


=== Zope3/src/zope/app/applicationcontrol/zopeversion.py 1.3 => 1.3.26.1 ===
--- Zope3/src/zope/app/applicationcontrol/zopeversion.py:1.3	Mon Dec 30 16:42:06 2002
+++ Zope3/src/zope/app/applicationcontrol/zopeversion.py	Sun Jun 22 10:22:34 2003
@@ -19,10 +19,11 @@
 
 import zope
 from zope.app.interfaces.applicationcontrol.zopeversion import IZopeVersion
+from zope.interface import implements
 
 class ZopeVersion:
 
-    __implements__ =  IZopeVersion
+    implements(IZopeVersion)
 
     def getZopeVersion(self):