[Checkins] SVN: grokui.base/trunk/s use grok as import hub and thus rely on grokcore.layout
Jan-Wijbrand Kolman
janwijbrand at gmail.com
Thu Jul 14 09:56:40 EDT 2011
Log message for revision 122236:
use grok as import hub and thus rely on grokcore.layout
Changed:
U grokui.base/trunk/setup.py
U grokui.base/trunk/src/grokui/base/README.txt
U grokui.base/trunk/src/grokui/base/contentproviders.py
U grokui.base/trunk/src/grokui/base/layout.py
U grokui.base/trunk/src/grokui/base/messages.py
U grokui.base/trunk/src/grokui/base/namespace.py
U grokui.base/trunk/src/grokui/base/tests/test_layout.py
U grokui.base/trunk/src/grokui/base/viewlets.py
-=-
Modified: grokui.base/trunk/setup.py
===================================================================
--- grokui.base/trunk/setup.py 2011-07-14 13:55:12 UTC (rev 122235)
+++ grokui.base/trunk/setup.py 2011-07-14 13:56:40 UTC (rev 122236)
@@ -3,6 +3,7 @@
tests_require = [
'martian',
+ 'grokcore.component',
'zope.annotation',
'zope.app.appsetup',
'zope.app.pagetemplate',
@@ -55,11 +56,8 @@
namespace_packages = ['grokui'],
install_requires=[
'fanstatic',
- 'grokcore.component',
- 'grokcore.layout',
+ 'grok',
'grokcore.message',
- 'grokcore.view',
- 'grokcore.viewlet',
'megrok.menu',
'setuptools',
'zope.authentication',
Modified: grokui.base/trunk/src/grokui/base/README.txt
===================================================================
--- grokui.base/trunk/src/grokui/base/README.txt 2011-07-14 13:55:12 UTC (rev 122235)
+++ grokui.base/trunk/src/grokui/base/README.txt 2011-07-14 13:56:40 UTC (rev 122236)
@@ -32,7 +32,7 @@
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 @@
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).
Modified: grokui.base/trunk/src/grokui/base/contentproviders.py
===================================================================
--- grokui.base/trunk/src/grokui/base/contentproviders.py 2011-07-14 13:55:12 UTC (rev 122235)
+++ grokui.base/trunk/src/grokui/base/contentproviders.py 2011-07-14 13:56:40 UTC (rev 122236)
@@ -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)
Modified: grokui.base/trunk/src/grokui/base/layout.py
===================================================================
--- grokui.base/trunk/src/grokui/base/layout.py 2011-07-14 13:55:12 UTC (rev 122235)
+++ grokui.base/trunk/src/grokui/base/layout.py 2011-07-14 13:56:40 UTC (rev 122236)
@@ -1,6 +1,5 @@
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
@@ -8,7 +7,7 @@
grok.layer(GrokUILayer)
-class GrokUILayout(Layout):
+class GrokUILayout(grok.Layout):
"""The general layout for the administration
"""
grok.context(IGrokUIRealm)
@@ -20,7 +19,7 @@
self.baseurl = absoluteURL(self.context, self.request) + '/'
-class GrokUIView(Page):
+class GrokUIView(grok.Page):
"""A grok ui view.
"""
grok.baseclass()
Modified: grokui.base/trunk/src/grokui/base/messages.py
===================================================================
--- grokui.base/trunk/src/grokui/base/messages.py 2011-07-14 13:55:12 UTC (rev 122235)
+++ grokui.base/trunk/src/grokui/base/messages.py 2011-07-14 13:56:40 UTC (rev 122236)
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
-
-import grokcore.component as grok
+import grok
from grokcore.message import UniqueMessageSource
Modified: grokui.base/trunk/src/grokui/base/namespace.py
===================================================================
--- grokui.base/trunk/src/grokui/base/namespace.py 2011-07-14 13:55:12 UTC (rev 122235)
+++ grokui.base/trunk/src/grokui/base/namespace.py 2011-07-14 13:56:40 UTC (rev 122236)
@@ -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
Modified: grokui.base/trunk/src/grokui/base/tests/test_layout.py
===================================================================
--- grokui.base/trunk/src/grokui/base/tests/test_layout.py 2011-07-14 13:55:12 UTC (rev 122235)
+++ grokui.base/trunk/src/grokui/base/tests/test_layout.py 2011-07-14 13:56:40 UTC (rev 122236)
@@ -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
Modified: grokui.base/trunk/src/grokui/base/viewlets.py
===================================================================
--- grokui.base/trunk/src/grokui/base/viewlets.py 2011-07-14 13:55:12 UTC (rev 122235)
+++ grokui.base/trunk/src/grokui/base/viewlets.py 2011-07-14 13:56:40 UTC (rev 122236)
@@ -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)
More information about the checkins
mailing list