[Checkins] SVN: grokcore.view/trunk/src/grokcore/view/meta/ using functions for looking up and choosing local-site-manager when registring components

[Christian Klinger]

Log message for revision 125391:
  using functions for looking up and choosing local-site-manager when registring components

Changed:
  U   grokcore.view/trunk/src/grokcore/view/meta/contentproviders.py
  U   grokcore.view/trunk/src/grokcore/view/meta/directoryresource.py
  U   grokcore.view/trunk/src/grokcore/view/meta/skin.py
  U   grokcore.view/trunk/src/grokcore/view/meta/views.py

-=-
Modified: grokcore.view/trunk/src/grokcore/view/meta/contentproviders.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/meta/contentproviders.py	2012-04-29 14:12:23 UTC (rev 125390)
+++ grokcore.view/trunk/src/grokcore/view/meta/contentproviders.py	2012-04-29 14:13:40 UTC (rev 125391)
@@ -19,6 +19,7 @@
 
 import grokcore.security
 import grokcore.view
+import grokcore.component.util
 from grokcore.view.interfaces import IContentProvider
 from grokcore.view.meta.views import default_view_name, TemplateGrokker
 
@@ -47,7 +48,7 @@
 
         config.action(
             discriminator=('contentprovider', context, layer, view, name),
-            callable=component.provideAdapter,
+            callable=grokcore.component.util.provideAdapter,
             args=(factory, (context, layer, view), IContentProvider, name))
         return True
 

Modified: grokcore.view/trunk/src/grokcore/view/meta/directoryresource.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/meta/directoryresource.py	2012-04-29 14:12:23 UTC (rev 125390)
+++ grokcore.view/trunk/src/grokcore/view/meta/directoryresource.py	2012-04-29 14:13:40 UTC (rev 125391)
@@ -23,6 +23,7 @@
 from martian.error import GrokError
 
 import grokcore.view
+import grokcore.component.util
 from grokcore.view import components
 
 allowed_resource_names = (
@@ -58,7 +59,7 @@
     provides = interface.Interface
     config.action(
         discriminator=('adapter', adapts, provides, name),
-        callable=component.provideAdapter,
+        callable=grokcore.component.util.provideAdapter,
         args=(resource_factory, adapts, provides, name),
         )
     return True

Modified: grokcore.view/trunk/src/grokcore/view/meta/skin.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/meta/skin.py	2012-04-29 14:12:23 UTC (rev 125390)
+++ grokcore.view/trunk/src/grokcore/view/meta/skin.py	2012-04-29 14:13:40 UTC (rev 125391)
@@ -14,7 +14,6 @@
 """Grokkers for the skin support."""
 
 
-import zope.component.interface
 from zope.interface.interface import InterfaceClass
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.publisher.interfaces.browser import IBrowserSkinType
@@ -23,6 +22,7 @@
 from martian.error import GrokError
 
 import grokcore.view
+import grokcore.component
 
 _skin_not_used = object()
 
@@ -48,6 +48,6 @@
                 )
         config.action(
             discriminator=('utility', IBrowserSkinType, skin),
-            callable=zope.component.interface.provideInterface,
+            callable=grokcore.component.util.provideInterface,
             args=(skin, interface, IBrowserSkinType))
         return True

Modified: grokcore.view/trunk/src/grokcore/view/meta/views.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/meta/views.py	2012-04-29 14:12:23 UTC (rev 125390)
+++ grokcore.view/trunk/src/grokcore/view/meta/views.py	2012-04-29 14:13:40 UTC (rev 125391)
@@ -24,6 +24,7 @@
 
 import grokcore.security
 import grokcore.view
+import grokcore.component.util
 from grokcore.security.util import protect_getattr
 from grokcore.view import components
 from grokcore.view import templatereg
@@ -104,7 +105,7 @@
 
         config.action(
             discriminator=('adapter', adapts, provides, name),
-            callable=component.provideAdapter,
+            callable=grokcore.component.util.provideAdapter,
             args=(factory, adapts, provides, name),
             )
         return True