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

[Lorenzo Gil]

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

Changed:
  U   zope.app.demo/trunk/src/zope/app/demo/insensitivefolder/__init__.py
  U   zope.app.demo/trunk/src/zope/app/demo/menu/menu.py

-=-
Modified: zope.app.demo/trunk/src/zope/app/demo/insensitivefolder/__init__.py
===================================================================
--- zope.app.demo/trunk/src/zope/app/demo/insensitivefolder/__init__.py	2008-04-21 17:57:34 UTC (rev 85557)
+++ zope.app.demo/trunk/src/zope/app/demo/insensitivefolder/__init__.py	2008-04-21 18:02:48 UTC (rev 85558)
@@ -17,32 +17,31 @@
 """
 __docformat__ = 'restructuredtext'
 
-from zope.component import adapts
+from zope.component import adapts, queryMultiAdapter
 from zope.component.interfaces import IFactory
 from zope.interface import implements, implementedBy
-from zope.interface import directlyProvides, directlyProvidedBy 
+from zope.interface import directlyProvides, directlyProvidedBy
 from zope.publisher.interfaces import NotFound
 
-from zope.app import zapi
 from zope.app.folder import Folder
 from zope.app.folder.interfaces import IFolder
 from zope.app.container.traversal import ContainerTraverser
 from zope.app.container.interfaces import IReadContainer
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.i18nmessageid import ZopeMessageFactory as _
 
 class CaseInsensitiveContainerTraverser(ContainerTraverser):
     adapts(IReadContainer)
 
     def publishTraverse(self, request, name):
         """See zope.publisher.interfaces.browser.IBrowserPublisher"""
-        subob = self._guessTraverse(name) 
+        subob = self._guessTraverse(name)
         if subob is None:
-            view = zapi.queryMultiAdapter((self.context, request), name=name)
+            view = queryMultiAdapter((self.context, request), name=name)
             if view is not None:
                 return view
 
             raise NotFound(self.context, name, request)
-         
+
         return subob
 
     def _guessTraverse(self, name):

Modified: zope.app.demo/trunk/src/zope/app/demo/menu/menu.py
===================================================================
--- zope.app.demo/trunk/src/zope/app/demo/menu/menu.py	2008-04-21 17:57:34 UTC (rev 85557)
+++ zope.app.demo/trunk/src/zope/app/demo/menu/menu.py	2008-04-21 18:02:48 UTC (rev 85558)
@@ -17,11 +17,12 @@
 """
 __docformat__ = "reStructuredText"
 from zope.interface import implements
+from zope.component import queryMultiAdapter
 
-from zope.app import zapi
 from zope.app.component.hooks import getSite
 from zope.dublincore.interfaces import IZopeDublinCore
 from zope.app.publisher.interfaces.browser import IBrowserMenu
+from zope.traversing.browser.absoluteurl import absoluteURL
 
 
 class RecentlyOpened(object):
@@ -31,7 +32,7 @@
     items in a container.
     """
     implements(IBrowserMenu)
-    
+
     def __init__(self, id, title=u'', description=u''):
         self.id = id
         self.title = title
@@ -41,11 +42,11 @@
         """Return menu item entries in a TAL-friendly form."""
         result = []
         site = getSite()
-        url = zapi.absoluteURL(site, request)        
+        url = absoluteURL(site, request)
 
         for name, item in object.items():
             dc = IZopeDublinCore(item, None)
-            zmi_icon = zapi.queryMultiAdapter((item, request), name='zmi_icon')
+            zmi_icon = queryMultiAdapter((item, request), name='zmi_icon')
 
             result.append(
                 {'title': name,
@@ -55,5 +56,5 @@
                  'icon': zmi_icon and zmi_icon.url() or None,
                  'extra': {},
                  'submenu': None})
-    
+
         return result