[Zope3-checkins] CVS: Zope3/src/zope/app/traversing - adapters.py:1.18 namespace.py:1.26

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/traversing
In directory cvs.zope.org:/tmp/cvs-serv21993/src/zope/app/traversing

Modified Files:
	adapters.py namespace.py 
Log Message:
Changed most calls to queryAdapter to use interface calls instead.


=== Zope3/src/zope/app/traversing/adapters.py 1.17 => 1.18 ===
--- Zope3/src/zope/app/traversing/adapters.py:1.17	Sat Mar  6 11:50:31 2004
+++ Zope3/src/zope/app/traversing/adapters.py	Sat Mar  6 12:48:54 2004
@@ -21,8 +21,6 @@
 from zope.app.interfaces.traversing import IContainmentRoot
 from zope.app.interfaces.traversing import ITraverser, ITraversable
 
-from zope.component import queryAdapter
-
 from zope.app.traversing.namespace import namespaceLookup
 from zope.app.traversing.namespace import UnexpectedParameters
 from zope.app.traversing.namespace import parameterizedNameParse
@@ -170,7 +168,7 @@
             # Special-case dicts
             return obj[name]
 
-        traversable = queryAdapter(obj, ITraversable, None)
+        traversable = ITraversable(obj, None)
         if traversable is None:
             raise NotFoundError('No traversable adapter found', obj)
 


=== Zope3/src/zope/app/traversing/namespace.py 1.25 => 1.26 ===
--- Zope3/src/zope/app/traversing/namespace.py:1.25	Fri Mar  5 17:09:19 2004
+++ Zope3/src/zope/app/traversing/namespace.py	Sat Mar  6 12:48:54 2004
@@ -114,7 +114,7 @@
     origOb = ob
     while i < 200:
         i += 1
-        traversable = zapi.queryAdapter(ob, ITraversable, None)
+        traversable = ITraversable(ob, None)
         if traversable is not None:
 
             try: