[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/component/ update imports

[Philipp von Weitershausen]

Log message for revision 65744:
  update imports
  use @adapter, @implementer instead of specifying interfaces in ZCML
  

Changed:
  UU  Products.Five/branches/philikon-local-components/component/__init__.py
  U   Products.Five/branches/philikon-local-components/component/configure.zcml

-=-
Modified: Products.Five/branches/philikon-local-components/component/__init__.py
===================================================================
--- Products.Five/branches/philikon-local-components/component/__init__.py	2006-03-02 20:55:29 UTC (rev 65743)
+++ Products.Five/branches/philikon-local-components/component/__init__.py	2006-03-02 20:56:48 UTC (rev 65744)
@@ -16,12 +16,15 @@
 $Id$
 """
 from zope.event import notify
+from zope.interface import Interface, implementer
 from zope.interface import alsoProvides, noLongerProvides
+from zope.component import adapter, getGlobalSiteManager
+from zope.component.interfaces import IComponentLookup
 from zope.app.publication.zopepublication import BeforeTraverseEvent
 from zope.app.component.interfaces import ISite, IPossibleSite
 
 import ExtensionClass
-from Acquisition import aq_base
+from Acquisition import aq_base, aq_inner, aq_parent
 from Products.SiteAccess.AccessRule import AccessRule
 from ZPublisher.BeforeTraverse import registerBeforeTraverse
 from ZPublisher.BeforeTraverse import unregisterBeforeTraverse
@@ -30,12 +33,12 @@
 import zope.app.component.hooks
 zope.app.component.hooks.setHooks()
 
+ at adapter(Interface)
+ at implementer(IComponentLookup)
 def siteManagerAdapter(ob):
-    """An adapter * -> ISiteManager.
-
-    This is registered in place of the one in Zope 3 so that we lookup
-    using acquisition instead of ILocation.
-    """
+    """Look-up a site manager/component registry for local component
+    lookup.  This is registered in place of the one in Zope 3 so that
+    we lookup using acquisition in addition to ILocation."""
     current = ob
     while True:
         if ISite.providedBy(current):


Property changes on: Products.Five/branches/philikon-local-components/component/__init__.py
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: Products.Five/branches/philikon-local-components/component/configure.zcml
===================================================================
--- Products.Five/branches/philikon-local-components/component/configure.zcml	2006-03-02 20:55:29 UTC (rev 65743)
+++ Products.Five/branches/philikon-local-components/component/configure.zcml	2006-03-02 20:56:48 UTC (rev 65744)
@@ -1,11 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:browser="http://namespaces.zope.org/browser">
 
-  <adapter
-      for="*"
-      provides="zope.component.interfaces.IComponentLookup"
-      factory=".siteManagerAdapter"
-      />
+  <adapter factory=".siteManagerAdapter" />
 
   <subscriber
       for="zope.app.component.interfaces.ISite