[Checkins] SVN: zope.introspector/trunk/src/zope/introspector/ Remove ZCML adapter registration. Use grokcore.component instead.

[Uli Fouquet]

Log message for revision 87640:
  Remove ZCML adapter registration. Use grokcore.component instead.

Changed:
  U   zope.introspector/trunk/src/zope/introspector/adapters.py
  U   zope.introspector/trunk/src/zope/introspector/configure.zcml

-=-
Modified: zope.introspector/trunk/src/zope/introspector/adapters.py
===================================================================
--- zope.introspector/trunk/src/zope/introspector/adapters.py	2008-06-21 21:29:04 UTC (rev 87639)
+++ zope.introspector/trunk/src/zope/introspector/adapters.py	2008-06-21 22:08:50 UTC (rev 87640)
@@ -4,10 +4,11 @@
 from zope.component.interfaces import (IAdapterRegistration,
                                        IHandlerRegistration,
                                        IUtilityRegistration)
+import grokcore.component as grok
 
-class AdapterSearch(object):
-    implements(IRegistrySearch)
-    adapts(IAdapterRegistration)
+class AdapterSearch(grok.Adapter):
+    grok.implements(IRegistrySearch)
+    grok.context(IAdapterRegistration)
 
     def __init__(self, registration):
         self.registration = registration
@@ -43,9 +44,9 @@
         return self.registration
     
         
-class HandlerSearch(object):
-    implements(IRegistrySearch)
-    adapts(IHandlerRegistration)
+class HandlerSearch(grok.Adapter):
+    grok.implements(IRegistrySearch)
+    grok.context(IHandlerRegistration)
 
     def __init__(self, registration):
         self.registration = registration
@@ -80,9 +81,9 @@
     
 
         
-class UtilitySearch(object):
-    implements(IRegistrySearch)
-    adapts(IUtilityRegistration)
+class UtilitySearch(grok.Adapter):
+    grok.implements(IRegistrySearch)
+    grok.context(IUtilityRegistration)
 
     def __init__(self, registration):
         self.registration = registration

Modified: zope.introspector/trunk/src/zope/introspector/configure.zcml
===================================================================
--- zope.introspector/trunk/src/zope/introspector/configure.zcml	2008-06-21 21:29:04 UTC (rev 87639)
+++ zope.introspector/trunk/src/zope/introspector/configure.zcml	2008-06-21 22:08:50 UTC (rev 87640)
@@ -5,22 +5,5 @@
   <include package="grokcore.component" file="meta.zcml" />
   <grok:grok package="." />
  	
- <adapter
- 	for="zope.component.interfaces.IAdapterRegistration"
- 	provides=".interfaces.IRegistrySearch"
- 	factory=".adapters.AdapterSearch"
- 	/>
-
- <adapter
- 	for="zope.component.interfaces.IHandlerRegistration"
- 	provides=".interfaces.IRegistrySearch"
- 	factory=".adapters.HandlerSearch"
- 	/>
-
- <adapter
- 	for="zope.component.interfaces.IUtilityRegistration"
- 	provides=".interfaces.IRegistrySearch"
- 	factory=".adapters.UtilitySearch"
- 	/>
  
 </configure>