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

[Lorenzo Gil]

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

Changed:
  U   zope.app.tree/trunk/src/zope/app/tree/adapters.py
  U   zope.app.tree/trunk/src/zope/app/tree/node.py
  U   zope.app.tree/trunk/src/zope/app/tree/tests/test_filters.py

-=-
Modified: zope.app.tree/trunk/src/zope/app/tree/adapters.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/adapters.py	2008-04-26 20:55:47 UTC (rev 85778)
+++ zope.app.tree/trunk/src/zope/app/tree/adapters.py	2008-04-27 10:36:47 UTC (rev 85779)
@@ -25,8 +25,8 @@
 from zope.security import canAccess
 from zope.security.interfaces import Unauthorized
 from zope.location.interfaces import ILocation
+from zope.traversing.api import getParents
 
-from zope.app import zapi
 from zope.app.container.interfaces import IReadContainer
 from zope.app.component.interfaces import ISite
 
@@ -69,7 +69,7 @@
             # always try to be unique
             return str(id(context))
         parents = [context.__name__]
-        parents += [parent.__name__ for parent in zapi.getParents(context)
+        parents += [parent.__name__ for parent in getParents(context)
                     if parent.__name__]
         return '\\'.join(parents)
 

Modified: zope.app.tree/trunk/src/zope/app/tree/node.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/node.py	2008-04-26 20:55:47 UTC (rev 85778)
+++ zope.app.tree/trunk/src/zope/app/tree/node.py	2008-04-27 10:36:47 UTC (rev 85779)
@@ -15,8 +15,8 @@
 
 $Id$
 """
+from zope.component import getUtility
 from zope.interface import implements
-from zope.app import zapi
 from zope.app.tree.interfaces import INode, IUniqueId, IChildObjects
 from zope.app.tree.interfaces import ITreeStateEncoder
 
@@ -113,7 +113,7 @@
         nodes = []
         if row_state is None:
             row_state = []
-        encoder = zapi.getUtility(ITreeStateEncoder)
+        encoder = getUtility(ITreeStateEncoder)
 
         if self.hasChildren() and len(row_state) > maxdepth:
             maxdepth = len(row_state)

Modified: zope.app.tree/trunk/src/zope/app/tree/tests/test_filters.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/tests/test_filters.py	2008-04-26 20:55:47 UTC (rev 85778)
+++ zope.app.tree/trunk/src/zope/app/tree/tests/test_filters.py	2008-04-27 10:36:47 UTC (rev 85779)
@@ -19,7 +19,6 @@
 
 from zope.interface import implements, directlyProvides
 from zope.interface.interface import InterfaceClass
-from zope.app import zapi
 
 from zope.app.tree.filters import OnlyInterfacesFilter, AllButInterfacesFilter