[Checkins] SVN: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/ Substitute zope.app.zapi by direct calls to its wrapped apis. See bug 219302

[Lorenzo Gil]

Log message for revision 85497:
  Substitute zope.app.zapi by direct calls to its wrapped apis. See bug 219302

Changed:
  U   zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/servercontrol.py
  U   zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_servercontrolview.py
  U   zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/translationdomaincontrol.py
  U   zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/tests/test_runtimeinfo.py

-=-
Modified: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/servercontrol.py
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/servercontrol.py	2008-04-20 02:16:32 UTC (rev 85496)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/servercontrol.py	2008-04-20 09:29:04 UTC (rev 85497)
@@ -17,7 +17,7 @@
 """
 __docformat__ = 'restructuredtext'
 
-from zope.app import zapi
+import zope.component
 from zope.app.applicationcontrol.interfaces import IServerControl
 
 from zope.app.applicationcontrol.i18n import ZopeMessageFactory as _
@@ -26,7 +26,7 @@
 class ServerControlView(object):
 
     def serverControl(self):
-        return zapi.getUtility(IServerControl)
+        return zope.component.getUtility(IServerControl)
 
     def action(self):
         """Do the shutdown/restart!"""

Modified: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_servercontrolview.py
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_servercontrolview.py	2008-04-20 02:16:32 UTC (rev 85496)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/tests/test_servercontrolview.py	2008-04-20 09:29:04 UTC (rev 85497)
@@ -17,8 +17,8 @@
 """
 import unittest
 
+import zope.component
 from zope.interface import implements
-from zope.app import zapi
 from zope.app.applicationcontrol.applicationcontrol import applicationController
 from zope.app.applicationcontrol.browser.servercontrol import ServerControlView
 from zope.app.applicationcontrol.interfaces import IServerControl
@@ -46,7 +46,8 @@
 
     def test_ServerControlView(self):
         control = ServerControlStub()
-        zapi.getGlobalSiteManager().registerUtility(control, IServerControl)
+        globalSiteManager = zope.component.getGlobalSiteManager()
+        globalSiteManager.registerUtility(control, IServerControl)
 
         test_serverctrl = self._TestView__newView(
             applicationController,

Modified: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/translationdomaincontrol.py
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/translationdomaincontrol.py	2008-04-20 02:16:32 UTC (rev 85496)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/browser/translationdomaincontrol.py	2008-04-20 09:29:04 UTC (rev 85497)
@@ -17,8 +17,8 @@
 """
 __docformat__ = 'restructuredtext'
 
+import zope.component
 from zope.i18n.interfaces import ITranslationDomain
-from zope.app import zapi
 from zope.app.applicationcontrol.i18n import ZopeMessageFactory as _
 
 
@@ -26,7 +26,7 @@
 
     def getCatalogsInfo(self):
         info = []
-        for name, domain in zapi.getUtilitiesFor(ITranslationDomain):
+        for name, domain in zope.component.getUtilitiesFor(ITranslationDomain):
             if not hasattr(domain, 'getCatalogsInfo'):
                 continue
             lang_info = []
@@ -44,7 +44,7 @@
             language = self.request.get('language')
             domain = self.request.get('domain')
 
-            domain = zapi.getUtility(ITranslationDomain, domain)
+            domain = zope.component.getUtility(ITranslationDomain, domain)
             for lang, fileNames in domain.getCatalogsInfo().items():
                 if lang == language:
                     domain.reloadCatalogs(fileNames)

Modified: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/tests/test_runtimeinfo.py
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/tests/test_runtimeinfo.py	2008-04-20 02:16:32 UTC (rev 85496)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/tests/test_runtimeinfo.py	2008-04-20 09:29:04 UTC (rev 85497)
@@ -22,7 +22,7 @@
 except ImportError:
     locale = None
 
-from zope.app import zapi
+import zope.component
 from zope.interface import implements
 from zope.interface.verify import verifyObject
 from zope.app.applicationcontrol.applicationcontrol import applicationController
@@ -80,7 +80,9 @@
         # we expect that there is no utility
         self.assertEqual(runtime_info.getZopeVersion(), u"Unavailable")
 
-        zapi.getSiteManager().registerUtility(TestZopeVersion(), IZopeVersion)
+        siteManager = zope.component.getSiteManager()
+        siteManager.registerUtility(TestZopeVersion(), IZopeVersion)
+
         self.assertEqual(runtime_info.getZopeVersion(), stupid_version_string)
 
     def test_PythonVersion(self):