[Zodb-checkins] CVS: Zope3/src/zope/interface - surrogate.py:1.1.2.5

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/interface
In directory cvs.zope.org:/tmp/cvs-serv4503

Modified Files:
      Tag: adaptergeddon-branch
	surrogate.py 
Log Message:
Don't have surrogates imply their ancestors.  We check if
provided.isImplementedBy(ob) upstream anyway.


=== Zope3/src/zope/interface/surrogate.py 1.1.2.4 => 1.1.2.5 ===
--- Zope3/src/zope/interface/surrogate.py:1.1.2.4	Thu Oct 16 17:42:38 2003
+++ Zope3/src/zope/interface/surrogate.py	Thu Oct 16 18:48:28 2003
@@ -85,13 +85,7 @@
         del self.dependents[dependent]
 
     def extends(self, other, strict=True):
-        if other is self and strict:
-            return False
-        
-        i = self._implied.get(other)
-        if i is not None and not i:
-            return True
-        return False
+        return self._interface().extends(other._interface(), strict)
 
     def isImplementedBy(self, ob):
         return self._interface().isImplementedBy(ob)
@@ -114,9 +108,6 @@
 
 
         for ancestor in ancestors:
-            # We directly imply our ancestors:
-            implied[ancestor] = ()
-
             # Work dict used to keep track of the registered interface
             # leading to an implied entry. This is so that we can can
             # override an implied entry of we get a closer "provided"