[Zope3-checkins] CVS: Zope3/src/zope/interface - adapter.py:1.3.14.1
Jim Fulton
jim@zope.com
Thu, 17 Apr 2003 06:18:27 -0400
Update of /cvs-repository/Zope3/src/zope/interface
In directory cvs.zope.org:/tmp/cvs-serv27463/src/zope/interface
Modified Files:
Tag: uk-april-2003-usability-branch
adapter.py
Log Message:
Checking Seb's sprint work into a branch
=== Zope3/src/zope/interface/adapter.py 1.3 => 1.3.14.1 ===
--- Zope3/src/zope/interface/adapter.py:1.3 Mon Jan 20 15:02:52 2003
+++ Zope3/src/zope/interface/adapter.py Thu Apr 17 06:17:56 2003
@@ -85,7 +85,6 @@
Finds a registered component that provides the given interface.
Returns None if not found.
"""
-
if filter is None:
cache = getattr(self, '_v_cache', self)
if cache is self:
@@ -115,6 +114,8 @@
return default
def getForObject(self, object, interface, filter=None):
+ # XXX if the object implements independently of its class we need
+ # to combine their __implements__
return self.get((getattr(object, '__implements__', None), interface),
filter=filter)