[Zope3-checkins] CVS: Zope3/src/zope/app/catalog - catalog.py:1.21

[Jim Fulton]

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

Modified Files:
	catalog.py 
Log Message:
Converted most getAdapter calls to use interface calls instead.


=== Zope3/src/zope/app/catalog/catalog.py 1.20 => 1.21 ===
--- Zope3/src/zope/app/catalog/catalog.py:1.20	Wed Mar  3 05:38:38 2004
+++ Zope3/src/zope/app/catalog/catalog.py	Sat Mar  6 11:50:18 2004
@@ -22,7 +22,7 @@
 from zope.security.proxy import trustedRemoveSecurityProxy
 from zope.index.interfaces import ISimpleQuery
 
-from zope.app.zapi import getService, getAdapter
+from zope.app.zapi import getService
 from zope.app.services.servicenames import HubIds
 from zope.app.event.interfaces import ISubscriber
 from zope.app.interfaces.annotation import IAttributeAnnotatable
@@ -124,7 +124,7 @@
             index = self.get(key)
             if not index: 
                 raise ValueError, "no such index %s"%(key)
-            index = getAdapter(index, ISimpleQuery)
+            index = ISimpleQuery(index)
             results = index.query(value)
             # Hm. As a result of calling getAdapter, I get back
             # security proxy wrapped results from anything that