[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services - adapter.py:1.1.2.3

Jim Fulton jim@zope.com
Wed, 11 Dec 2002 09:08:00 -0500


Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Services
In directory cvs.zope.org:/tmp/cvs-serv12533

Modified Files:
      Tag: AdapterAndView-branch
	adapter.py 
Log Message:
minor reformatting and renaming.


=== Zope3/lib/python/Zope/App/OFS/Services/adapter.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/lib/python/Zope/App/OFS/Services/adapter.py:1.1.2.2	Wed Dec 11 06:41:08 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/adapter.py	Wed Dec 11 09:07:59 2002
@@ -106,16 +106,16 @@
             adapter = registry.active().getAdapter(object)
             return adapter
 
-        return getNextService(self, 'Adapters').queryAdapter(object,
-                                                             interface,
-                                                             default)
+        adapters = getNextService(self, 'Adapters')
+
+        return adapters.queryAdapter(object, interface, default)
 
     queryAdapter = ContextMethod(queryAdapter)
 
     def getRegisteredMatching(self,
-                              required_interfaces=None,
+                              for_interfaces=None,
                               provided_interfaces=None):
-        return self._registry.getRegisteredMatching(required_interfaces,
+        return self._registry.getRegisteredMatching(for_interfaces,
                                                     provided_interfaces)
 
 class AdapterConfiguration(SimpleConfiguration):