[Checkins] SVN: z3c.componentdebug/trunk/src/z3c/componentdebug/ Oops, forgot to return the actual adapters

[Ross Patterson]

Log message for revision 76040:
  Oops, forgot to return the actual adapters
  

Changed:
  U   z3c.componentdebug/trunk/src/z3c/componentdebug/README.txt
  U   z3c.componentdebug/trunk/src/z3c/componentdebug/lookup/api.py
  U   z3c.componentdebug/trunk/src/z3c/componentdebug/lookup/registry.py

-=-
Modified: z3c.componentdebug/trunk/src/z3c/componentdebug/README.txt
===================================================================
--- z3c.componentdebug/trunk/src/z3c/componentdebug/README.txt	2007-05-31 05:04:15 UTC (rev 76039)
+++ z3c.componentdebug/trunk/src/z3c/componentdebug/README.txt	2007-05-31 05:35:56 UTC (rev 76040)
@@ -122,6 +122,11 @@
     ComponentLookupError: ((<Foo object at ...>, <Bar object at ...>),
     <InterfaceClass __builtin__.IBaz>, u'')
 
+    >>> bar2 = Bar()
+    >>> alsoProvides(bar2, IBar)
+    >>> _api.getMultiAdapter((foo, bar2), IBaz)
+    'baz'
+
     >>> from z3c.componentdebug.lookup.patch import patch
     >>> patch()
 
@@ -141,6 +146,9 @@
       - AdapterRegistration(<BaseGlobalComponents base>, [IFoo, IBar], IBaz, '', getBaz, u'')
     <Bar object at ...>: no matches
 
+    >>> _api.getMultiAdapter((foo, bar2), IBaz)
+    'baz'
+
     >>> from z3c.componentdebug.lookup.patch import cleanup
     >>> cleanup()
 
@@ -149,3 +157,6 @@
     ...
     ComponentLookupError: ((<Foo object at ...>, <Bar object at ...>),
     <InterfaceClass __builtin__.IBaz>, u'')
+
+    >>> _api.getMultiAdapter((foo, bar2), IBaz)
+    'baz'

Modified: z3c.componentdebug/trunk/src/z3c/componentdebug/lookup/api.py
===================================================================
--- z3c.componentdebug/trunk/src/z3c/componentdebug/lookup/api.py	2007-05-31 05:04:15 UTC (rev 76039)
+++ z3c.componentdebug/trunk/src/z3c/componentdebug/lookup/api.py	2007-05-31 05:35:56 UTC (rev 76040)
@@ -1,13 +1,14 @@
 from zope.interface import Interface
 from zope.component.interfaces import ComponentLookupError
 from zope.component import _api
+from zope import component
 
 from z3c.componentdebug.lookup import VerboseComponentLookupError
 
 origGetAdapterInContext = _api.getAdapterInContext
 def getAdapterInContext(object, interface, context):
     try:
-        origGetAdapterInContext(object, interface, context)
+        return origGetAdapterInContext(object, interface, context)
     except ComponentLookupError:
         raise VerboseComponentLookupError(
             (object,), interface, u'', context)
@@ -15,15 +16,16 @@
 origGetAdapter = _api.getAdapter
 def getAdapter(object, interface=Interface, name=u'', context=None):
     try:
-        origGetAdapter(object, interface, name, context)
+        return origGetAdapter(object, interface, name, context)
     except ComponentLookupError:
         raise VerboseComponentLookupError(
             (object,), interface, name, context)
 
 origGetMultiAdapter = _api.getMultiAdapter
-def getMultiAdapter(objects, interface=Interface, name=u'', context=None):
+def getMultiAdapter(objects, interface=Interface, name=u'',
+                    context=None):
     try:
-        origGetMultiAdapter(objects, interface, name, context)
+        return origGetMultiAdapter(objects, interface, name, context)
     except ComponentLookupError:
         raise VerboseComponentLookupError(
             objects, interface, name, context)
@@ -31,7 +33,7 @@
 origGetUtility = _api.getUtility
 def getUtility(interface, name='', context=None):
     try:
-        origGetUtility(interface, name, context)
+        return origGetUtility(interface, name, context)
     except ComponentLookupError:
         raise VerboseComponentLookupError(
             False, interface, name, context)
@@ -42,8 +44,18 @@
     _api.getMultiAdapter = getMultiAdapter
     _api.getUtility = getUtility
 
+    component.getAdapterInContext = getAdapterInContext
+    component.getAdapter = getAdapter
+    component.getMultiAdapter = getMultiAdapter
+    component.getUtility = getUtility
+
 def cleanup():
     _api.getAdapterInContext = origGetAdapterInContext
     _api.getAdapter = origGetAdapter
     _api.getMultiAdapter = origGetMultiAdapter
     _api.getUtility = origGetUtility
+
+    component.getAdapterInContext = origGetAdapterInContext
+    component.getAdapter = origGetAdapter
+    component.getMultiAdapter = origGetMultiAdapter
+    component.getUtility = origGetUtility

Modified: z3c.componentdebug/trunk/src/z3c/componentdebug/lookup/registry.py
===================================================================
--- z3c.componentdebug/trunk/src/z3c/componentdebug/lookup/registry.py	2007-05-31 05:04:15 UTC (rev 76039)
+++ z3c.componentdebug/trunk/src/z3c/componentdebug/lookup/registry.py	2007-05-31 05:35:56 UTC (rev 76040)
@@ -7,7 +7,7 @@
 origGetUtility = Components.getUtility
 def getUtility(self, provided, name=u''):
     try:
-        origGetUtility(self, provided, name)
+        return origGetUtility(self, provided, name)
     except ComponentLookupError:
         raise VerboseComponentLookupError(
             False, provided, name, self)
@@ -15,7 +15,7 @@
 origGetAdapter = Components.getAdapter
 def getAdapter(self, object, interface=Interface, name=u''):
     try:
-        origGetAdapter(self, object, interface, name)
+        return origGetAdapter(self, object, interface, name)
     except ComponentLookupError:
         raise VerboseComponentLookupError(
             (object,), interface, name, self)
@@ -23,7 +23,7 @@
 origGetMultiAdapter = Components.getMultiAdapter
 def getMultiAdapter(self, objects, interface=Interface, name=u''):
     try:
-        origGetMultiAdapter(self, objects, interface, name)
+        return origGetMultiAdapter(self, objects, interface, name)
     except ComponentLookupError:
         raise VerboseComponentLookupError(
             objects, interface, name, self)