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

[Lorenzo Gil]

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

Changed:
  U   zope.tutorial/trunk/directives.txt
  U   zope.tutorial/trunk/manager.py
  U   zope.tutorial/trunk/session.py

-=-
Modified: zope.tutorial/trunk/directives.txt
===================================================================
--- zope.tutorial/trunk/directives.txt	2008-05-01 06:41:38 UTC (rev 85953)
+++ zope.tutorial/trunk/directives.txt	2008-05-01 06:47:44 UTC (rev 85954)
@@ -13,9 +13,9 @@
 Now we can run the directive. First, let's make sure that no tutorials have
 been registered yet:
 
-  >>> from zope.app import zapi
+  >>> import zope.component
   >>> from zope.tutorial import interfaces
-  >>> list(zapi.getUtilitiesFor(interfaces.ITutorial))
+  >>> list(zope.component.getUtilitiesFor(interfaces.ITutorial))
   []
 
 Now run the registration code:
@@ -34,6 +34,6 @@
 Note that this file is not really a functional test-browser test, so it would
 not actually work in the Web interface. Now the tutorial is available:
 
-  >>> list(zapi.getUtilitiesFor(interfaces.ITutorial))
+  >>> list(zope.component.getUtilitiesFor(interfaces.ITutorial))
   [(u'zope_tutorial_directive',
     <Tutorial title=u'zope:tutorial Directive', file=u'directives.txt'>)]

Modified: zope.tutorial/trunk/manager.py
===================================================================
--- zope.tutorial/trunk/manager.py	2008-05-01 06:41:38 UTC (rev 85953)
+++ zope.tutorial/trunk/manager.py	2008-05-01 06:47:44 UTC (rev 85954)
@@ -17,9 +17,9 @@
 """
 __docformat__ = "reStructuredText"
 import zope.interface
+import zope.component
 from zope.app.apidoc import utilities
 from zope.app import location
-from zope.app import zapi
 
 from zope.tutorial import interfaces
 
@@ -35,14 +35,15 @@
 
     def get(self, key, default=None):
         """See zope.app.container.interfaces.IReadContainer"""
-        utility = zapi.queryUtility(interfaces.ITutorial, key, default)
+        utility = zope.component.queryUtility(interfaces.ITutorial,
+                                              key, default)
         if utility != default:
             utility = location.LocationProxy(utility, self, key)
         return utility
 
     def items(self):
         """See zope.app.container.interfaces.IReadContainer"""
-        items = list(zapi.getUtilitiesFor(interfaces.ITutorial))
+        items = list(zope.component.getUtilitiesFor(interfaces.ITutorial))
         items.sort()
         return [(name, location.LocationProxy(tutorial, self, name))
                 for name, tutorial in items]

Modified: zope.tutorial/trunk/session.py
===================================================================
--- zope.tutorial/trunk/session.py	2008-05-01 06:41:38 UTC (rev 85953)
+++ zope.tutorial/trunk/session.py	2008-05-01 06:47:44 UTC (rev 85954)
@@ -23,8 +23,9 @@
 import types
 import zope.proxy
 import zope.testbrowser
+from zope.component import getUtility
+from zope.traversing.api import getName
 from zope.app import annotation
-from zope.app import zapi
 from zope.app import container
 from zope.app.apidoc.utilities import renderText
 from zope.app.component import hooks
@@ -87,7 +88,7 @@
     def initialize(self):
         """See interfaces.ITutorialSession"""
         # Create a parts stack
-        tutorial = zapi.getUtility(interfaces.ITutorial, name=self.tutorialName)
+        tutorial = getUtility(interfaces.ITutorial, name=self.tutorialName)
         text = open(tutorial.path, 'r').read()
         parser = doctest.DocTestParser()
         parts = parser.parse(text)
@@ -165,7 +166,7 @@
         super(TutorialSessionManager, self).__init__()
 
     def createSession(self):
-        session = TutorialSession(zapi.getName(self))
+        session = TutorialSession(getName(self))
         chooser = container.interfaces.INameChooser(self)
         name = chooser.chooseName(u'session', session)
         self[name] = session
@@ -179,7 +180,7 @@
     """Used to traverse the `++sessions++` namespace"""
 
     def __init__(self, ob=None, request=None):
-        tutorialName = zapi.name(ob)
+        tutorialName = getName(ob)
         manager = SESSIONMANAGER_CACHE.get(tutorialName)
         if manager is None:
             manager = TutorialSessionManager()