[Zope3-checkins] CVS: Zope3/src/zope/app/component - globalinterfaceservice.py:1.15.2.1

[Sidnei da Silva]

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

Modified Files:
      Tag: dreamcatcher-ttwschema-branch
	globalinterfaceservice.py 
Log Message:
TTWSchema: Work in progress. Made a branch so I can work without disturbing everyone else

=== Zope3/src/zope/app/component/globalinterfaceservice.py 1.15 => 1.15.2.1 ===
--- Zope3/src/zope/app/component/globalinterfaceservice.py:1.15	Sat Aug  9 14:11:25 2003
+++ Zope3/src/zope/app/component/globalinterfaceservice.py	Tue Aug 12 09:19:16 2003
@@ -47,9 +47,9 @@
             # XXX Should use getService(), but that breaks a few
             # tests that do too basic setup to get the utilities
             # service started. I'll fix this later
-            utility = utilityService.queryUtility(IInterface, name=id)
-            if utility is not None:
-                return utility
+            utilities = self._queryUtilityInterfaces(search_string=id)
+            if utilities:
+                return utilities[0][1]
         return default
 
     def searchInterface(self, search_string=None, base=None):
@@ -83,8 +83,6 @@
         return '\n'.join(docs)
 
     def _queryUtilityInterfaces(self, interface=None, search_string=None):
-        if interface is None:
-            interface = IInterface
         # XXX Should use getService(), but that breaks a few
         # tests that do too basic setup to get the utilities
         # service started. I'll fix this later