[Checkins] SVN: grokcore.view/trunk/src/grokcore/view/meta/ use grokcore.component api

[Jan Wijbrand Kolman]

Log message for revision 125483:
  use grokcore.component api

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-05-01 12:45:18 UTC (rev 125482)
+++ grokcore.view/trunk/src/grokcore/view/meta/contentproviders.py	2012-05-01 12:45:39 UTC (rev 125483)
@@ -19,7 +19,6 @@
 
 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
 
@@ -48,7 +47,7 @@
 
         config.action(
             discriminator=('contentprovider', context, layer, view, name),
-            callable=grokcore.component.util.provideAdapter,
+            callable=grokcore.component.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-05-01 12:45:18 UTC (rev 125482)
+++ grokcore.view/trunk/src/grokcore/view/meta/directoryresource.py	2012-05-01 12:45:39 UTC (rev 125483)
@@ -23,7 +23,6 @@
 from martian.error import GrokError
 
 import grokcore.view
-import grokcore.component.util
 from grokcore.view import components
 
 allowed_resource_names = (
@@ -59,7 +58,7 @@
     provides = interface.Interface
     config.action(
         discriminator=('adapter', adapts, provides, name),
-        callable=grokcore.component.util.provideAdapter,
+        callable=grokcore.component.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-05-01 12:45:18 UTC (rev 125482)
+++ grokcore.view/trunk/src/grokcore/view/meta/skin.py	2012-05-01 12:45:39 UTC (rev 125483)
@@ -48,6 +48,6 @@
                 )
         config.action(
             discriminator=('utility', IBrowserSkinType, skin),
-            callable=grokcore.component.util.provideInterface,
+            callable=grokcore.component.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-05-01 12:45:18 UTC (rev 125482)
+++ grokcore.view/trunk/src/grokcore/view/meta/views.py	2012-05-01 12:45:39 UTC (rev 125483)
@@ -24,7 +24,6 @@
 
 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
@@ -105,7 +104,7 @@
 
         config.action(
             discriminator=('adapter', adapts, provides, name),
-            callable=grokcore.component.util.provideAdapter,
+            callable=grokcore.component.provideAdapter,
             args=(factory, adapts, provides, name),
             )
         return True