use grok as import hub and thus rely on grokcore.layout

setup.py

@@ -3,6 +3,7 @@
 
 tests_require = [
     'martian',
+    'grokcore.component',
     'zope.annotation',
     'zope.app.appsetup',
     'zope.app.pagetemplate',
@@ -55,11 +56,8 @@ def read(*rnames):
       namespace_packages = ['grokui'],
       install_requires=[
           'fanstatic',
-          'grokcore.component',
-          'grokcore.layout',
+          'grok',
           'grokcore.message',
-          'grokcore.view',
-          'grokcore.viewlet',
           'megrok.menu',
           'setuptools',
           'zope.authentication',

src/grokui/base/README.txt

@@ -32,7 +32,7 @@ We can build a simple admin screen that fits into the environment like
 this:
 
     >>> from martian.testing import FakeModule
-    >>> import grokcore.viewlet as grok
+    >>> import grok
     >>> from zope.interface import Interface
     >>> from grokui.base import GrokUILayer
 
@@ -113,7 +113,7 @@ layout automatically, the ``order`` tells at which position in the
 menu we want our page to appear. Pages without a title do not appear
 in the menu bar at all.
 
-Instances of `GrokUIView` are in fact `grokcore.layout.Page` instances
+Instances of `GrokUIView` are in fact `grok.Page` instances
 that render the content provided by a template or `render` method
 into a given layout (here: the general GrokUI layout).
 

src/grokui/base/contentproviders.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-import grokcore.viewlet as grok
-from megrok.menu import Menu
 from zope.site.interfaces import IRootFolder
 from zope.component import getUtility, getMultiAdapter
 from zope.browsermenu.interfaces import IBrowserMenu
+import grok
+from megrok.menu import Menu
 from grokui.base import IGrokUIRealm, GrokUILayer
 
 grok.layer(GrokUILayer)

src/grokui/base/layout.py

@@ -1,14 +1,13 @@
 from zope.traversing.browser.absoluteurl import absoluteURL
-import grokcore.view as grok
-from grokcore.layout import Layout, Page
+import grok
 from grokui.base import IGrokUIRealm, GrokUILayer, IUIPanel, MainMenu
 from grokui.base import resource
 import megrok.menu
 
 grok.layer(GrokUILayer)
 
 
-class GrokUILayout(Layout):
+class GrokUILayout(grok.Layout):
     """The general layout for the administration
     """
     grok.context(IGrokUIRealm)
@@ -20,7 +19,7 @@ def update(self):
         self.baseurl = absoluteURL(self.context, self.request) + '/'
 
 
-class GrokUIView(Page):
+class GrokUIView(grok.Page):
     """A grok ui view.
     """
     grok.baseclass()

src/grokui/base/messages.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-
-import grokcore.component as grok
+import grok
 from grokcore.message import UniqueMessageSource
 
 

src/grokui/base/namespace.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 """Components to keep Grok UI related stuff in a dedicated namespace.
 """
-import grokcore.view as grok
-
 from zope.site.interfaces import IRootFolder
 from zope.location import LocationProxy
 from zope.publisher.browser import applySkin
 from zope.publisher.interfaces import browser
 from zope.traversing.interfaces import ITraversable
+import grok
 from grokui.base.interfaces import IGrokUIRealm
 
 

src/grokui/base/tests/test_layout.py

@@ -12,7 +12,7 @@
 To create a view that automatically comes with the GrokUI layout, we
 can derive from `grokui.base.AdminView`.
 
-Instances of `AdminView` are in fact `grokcore.layout.Page` instances
+Instances of `AdminView` are in fact `grok.Page` instances
 that render the content provided by a template or `render` method
 into a given layout.
 
@@ -50,7 +50,7 @@
 import grokui.base
 import unittest
 import doctest
-import grokcore.component as grok
+import grok
 from grokui.base import GrokUIView
 from zope.fanstatic.testing import ZopeFanstaticBrowserLayer
 

src/grokui/base/viewlets.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
-import grokcore.viewlet as grok
-from grokui.base import Header, Footer, Messages, IUIPanel, IGrokUIRealm
-from grokcore.message.utils import receive
 from zope.browsermenu.interfaces import IBrowserMenu
 from zope.authentication.interfaces import IUnauthenticatedPrincipal
 from zope.component import getUtility
+import grok
+from grokcore.message.utils import receive
+from grokui.base import Header, Footer, Messages, IUIPanel, IGrokUIRealm
 
 grok.view(IUIPanel)
 grok.context(IGrokUIRealm)