[Zodb-checkins] CVS: Zope3/lib/python/Interface/Registry - AdapterRegistry.py:1.3.18.1 IAdapterRegistry.py:1.3.18.2

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Interface/Registry
In directory cvs.zope.org:/tmp/cvs-serv23318/lib/python/Interface/Registry

Modified Files:
      Tag: AdapterAndView-branch
	AdapterRegistry.py IAdapterRegistry.py 
Log Message:
Got AdapterService views working.

=== Zope3/lib/python/Interface/Registry/AdapterRegistry.py 1.3 => 1.3.18.1 ===
--- Zope3/lib/python/Interface/Registry/AdapterRegistry.py:1.3	Mon Nov 18 15:40:16 2002
+++ Zope3/lib/python/Interface/Registry/AdapterRegistry.py	Wed Dec 11 06:41:06 2002
@@ -109,8 +109,15 @@
                               required_interfaces=None,
                               provided_interfaces=None):
 
+        
+        if IInterface.isImplementedBy(required_interfaces):
+            required_interfaces = (required_interfaces, )
 
         if provided_interfaces:
+
+            if IInterface.isImplementedBy(provided_interfaces):
+                provided_interfaces = (provided_interfaces, )
+            
             r = {}
 
             if required_interfaces:


=== Zope3/lib/python/Interface/Registry/IAdapterRegistry.py 1.3.18.1 => 1.3.18.2 ===
--- Zope3/lib/python/Interface/Registry/IAdapterRegistry.py:1.3.18.1	Tue Dec 10 09:37:01 2002
+++ Zope3/lib/python/Interface/Registry/IAdapterRegistry.py	Wed Dec 11 06:41:06 2002
@@ -92,8 +92,11 @@
 
         Zero or more required and provided interfaces may be
         specified. Registration information matching any of the
-        specified interfaces is returned. The returned value is a
-        sequence of three-element tuples:
+        specified interfaces is returned.
+
+        The arguments may be interfaces, or sequences of interfaces.
+
+        The returned value is a sequence of three-element tuples:
 
         - required interface