use grokcore.component api

zopefoundation · May 1, 2012 · 11cb526 · 11cb526
1 parent cc665c2
commit 11cb526
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/src/grokcore/view/meta/contentproviders.py b/src/grokcore/view/meta/contentproviders.py
@@ -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 @@ def execute(self, factory, config, context, layer, view, name, **kw):
 
         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
 

diff --git a/src/grokcore/view/meta/directoryresource.py b/src/grokcore/view/meta/directoryresource.py
@@ -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 @@ def _register(config, resource_path, name, layer):
     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

diff --git a/src/grokcore/view/meta/skin.py b/src/grokcore/view/meta/skin.py
@@ -48,6 +48,6 @@ def grok(self, name, interface, module_info, config, **kw):
                 )
         config.action(
             discriminator=('utility', IBrowserSkinType, skin),
-            callable=grokcore.component.util.provideInterface,
+            callable=grokcore.component.provideInterface,
             args=(skin, interface, IBrowserSkinType))
         return True
diff --git a/src/grokcore/view/meta/views.py b/src/grokcore/view/meta/views.py
@@ -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 @@ def execute(self, factory, config, context, layer, provides, name, **kw):
 
         config.action(
             discriminator=('adapter', adapts, provides, name),
-            callable=grokcore.component.util.provideAdapter,
+            callable=grokcore.component.provideAdapter,
             args=(factory, adapts, provides, name),
             )
         return True