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

[Jan Wijbrand Kolman]

Log message for revision 125484:
  use grokcore.component api

Changed:
  U   grokcore.viewlet/trunk/src/grokcore/viewlet/meta.py
  U   grokcore.viewlet/trunk/src/grokcore/viewlet/util.py

-=-
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/meta.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/meta.py	2012-05-01 12:45:39 UTC (rev 125483)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/meta.py	2012-05-01 12:45:51 UTC (rev 125484)
@@ -20,7 +20,6 @@
 import martian
 
 import grokcore.component
-import grokcore.component.util
 import grokcore.view
 from grokcore.view.meta.views import default_view_name, TemplateGrokker
 import grokcore.security
@@ -60,7 +59,7 @@
 
         config.action(
             discriminator=('viewletManager', context, layer, view, name),
-            callable=grokcore.component.util.provideAdapter,
+            callable=grokcore.component.provideAdapter,
             args=(factory, (context, layer, view), IViewletManager, name))
         return True
 
@@ -99,7 +98,7 @@
         config.action(
             discriminator=(
                 'viewlet', context, layer, view, viewletmanager, name),
-            callable=grokcore.component.util.provideAdapter,
+            callable=grokcore.component.provideAdapter,
             args=(factory, (context, layer, view, viewletmanager),
                   IViewlet, name))
 

Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/util.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/util.py	2012-05-01 12:45:39 UTC (rev 125483)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/util.py	2012-05-01 12:45:51 UTC (rev 125484)
@@ -17,7 +17,7 @@
 
 from grokcore.security.util import check_permission
 # BBB
-from grokcore.component.util import sort_components
+from grokcore.component. import sort_components
 
 
 def make_checker(factory, view_factory, permission, method_names=None):