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

[Lorenzo Gil]

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

Changed:
  U   zope.app.generations/trunk/src/zope/app/generations/browser/managerdetails.py
  U   zope.app.generations/trunk/src/zope/app/generations/browser/managers.py
  U   zope.app.generations/trunk/src/zope/app/generations/generations.py

-=-
Modified: zope.app.generations/trunk/src/zope/app/generations/browser/managerdetails.py
===================================================================
--- zope.app.generations/trunk/src/zope/app/generations/browser/managerdetails.py	2008-04-22 16:29:14 UTC (rev 85607)
+++ zope.app.generations/trunk/src/zope/app/generations/browser/managerdetails.py	2008-04-22 18:34:09 UTC (rev 85608)
@@ -16,7 +16,8 @@
 $Id$
 """
 __docformat__ = "reStructuredText"
-from zope.app import zapi
+import zope.component
+
 from zope.app.generations.interfaces import ISchemaManager
 from zope.app.renderer.rest import ReStructuredTextToHTMLRenderer
 
@@ -25,12 +26,12 @@
 
     This method needs to use the component architecture, so
     we'll set it up:
-    
+
       >>> from zope.app.testing.placelesssetup import setUp, tearDown
       >>> setUp()
-    
+
     We need to define some schema managers.  We'll define just one:
-    
+
       >>> from zope.app.generations.generations import SchemaManager
       >>> from zope.app.testing import ztapi
       >>> app1 = SchemaManager(0, 3, 'zope.app.generations.demo')
@@ -66,7 +67,7 @@
 
     def getEvolvers(self):
         id = self.id
-        manager = zapi.getUtility(ISchemaManager, id)
+        manager = zope.component.getUtility(ISchemaManager, id)
 
         evolvers = []
 
@@ -80,7 +81,7 @@
                 renderer = ReStructuredTextToHTMLRenderer(
                     unicode(info), self.request)
                 info = renderer.render()
-                
+
             evolvers.append({'from': gen, 'to': gen+1, 'info': info})
 
         return evolvers

Modified: zope.app.generations/trunk/src/zope/app/generations/browser/managers.py
===================================================================
--- zope.app.generations/trunk/src/zope/app/generations/browser/managers.py	2008-04-22 16:29:14 UTC (rev 85607)
+++ zope.app.generations/trunk/src/zope/app/generations/browser/managers.py	2008-04-22 18:34:09 UTC (rev 85608)
@@ -19,7 +19,8 @@
 
 import transaction
 
-from zope.app import zapi
+import zope.component
+
 from zope.app.generations.interfaces import ISchemaManager
 from zope.app.generations.generations import generations_key, Context
 
@@ -160,7 +161,7 @@
            """
 
         self.managers = managers = dict(
-            zapi.getUtilitiesFor(ISchemaManager))
+            zope.component.getUtilitiesFor(ISchemaManager))
         db = self._getdb()
         conn = db.open()
         try:

Modified: zope.app.generations/trunk/src/zope/app/generations/generations.py
===================================================================
--- zope.app.generations/trunk/src/zope/app/generations/generations.py	2008-04-22 16:29:14 UTC (rev 85607)
+++ zope.app.generations/trunk/src/zope/app/generations/generations.py	2008-04-22 18:34:09 UTC (rev 85608)
@@ -21,6 +21,7 @@
 
 import transaction
 
+import zope.component
 import zope.interface
 
 from interfaces import GenerationTooHigh, GenerationTooLow, UnableToEvolve
@@ -171,8 +172,7 @@
 
 def findManagers():
     # Hook to let Chris use this for Zope 2
-    import zope.app
-    return zope.app.zapi.getUtilitiesFor(ISchemaManager)
+    return zope.component.getUtilitiesFor(ISchemaManager)
 
 def PersistentDict():
     # Another hook to let Chris use this for Zope 2