[Checkins] SVN: grokui.base/trunk/s Got rid of the zope.app.zcmlfiles dependency.
Souheil CHELFOUH
souheil at chelfouh.com
Sat Mar 6 14:58:24 EST 2010
Log message for revision 109721:
Got rid of the zope.app.zcmlfiles dependency.
Now, grokui.base uses the grokcore.message package.
Very small changes on the CSS.
Changed:
U grokui.base/trunk/setup.py
U grokui.base/trunk/src/grokui/base/README.txt
U grokui.base/trunk/src/grokui/base/configure.zcml
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/ftesting.zcml
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 2010-03-06 18:25:56 UTC (rev 109720)
+++ grokui.base/trunk/setup.py 2010-03-06 19:58:23 UTC (rev 109721)
@@ -2,12 +2,21 @@
from setuptools import setup, find_packages
tests_require = [
- 'zope.security',
'zope.testbrowser',
'zope.securitypolicy',
+ 'zope.browserpage',
+ 'zope.principalregistry',
'zope.app.testing',
+ 'zope.app.appsetup',
'zope.testing',
+ 'zope.password',
'grokcore.component',
+ 'zope.annotation',
+ 'zope.app.pagetemplate',
+ 'zope.app.publication',
+ 'zope.browserresource',
+ 'zope.container',
+ 'zope.contentprovider',
]
def read(*rnames):
@@ -45,10 +54,13 @@
zip_safe=False,
namespace_packages = ['grokui'],
install_requires=[
- 'grok',
+ 'grokcore.component',
+ 'grokcore.message',
+ 'grokcore.view',
+ 'grokcore.viewlet',
'megrok.layout',
'megrok.menu',
- 'grokcore.message',
+ 'setuptools',
'zope.authentication',
'zope.browsermenu',
'zope.component',
@@ -56,8 +68,8 @@
'zope.location',
'zope.publisher',
'zope.site',
+ 'zope.security',
'zope.traversing',
- 'setuptools',
],
tests_require = tests_require,
extras_require = dict(test=tests_require),
Modified: grokui.base/trunk/src/grokui/base/README.txt
===================================================================
--- grokui.base/trunk/src/grokui/base/README.txt 2010-03-06 18:25:56 UTC (rev 109720)
+++ grokui.base/trunk/src/grokui/base/README.txt 2010-03-06 19:58:23 UTC (rev 109721)
@@ -34,7 +34,7 @@
We can build a simple admin screen that fits into the environment like
this:
- >>> import grok
+ >>> import grokcore.viewlet as grok
>>> from zope.interface import Interface
>>> from grokui.base import GrokUILayer
@@ -50,7 +50,8 @@
We grok this view to register it with the component architechture:
- >>> grok.testing.grok_component('MyAdminScreen', MyAdminScreen)
+ >>> from grokcore.component.testing import grok_component
+ >>> grok_component('MyAdminScreen', MyAdminScreen)
True
Let's create a browser to lookup this view:
@@ -88,6 +89,7 @@
>>> from grokui.base.layout import GrokUIView
>>> from grokui.base.namespace import GrokUILayer
+
>>> class CaveManagementScreen(GrokUIView):
... # Name where we can access this page via URL:
... grok.name('managecave')
@@ -103,8 +105,7 @@
... # for the actual contents of this page.
... return u'Hello cave manager!'
- >>> grok.testing.grok_component(
- ... 'CaveManagementScreen', CaveManagementScreen)
+ >>> grok_component('CaveManagementScreen', CaveManagementScreen)
True
While the title will be displayed in the main menu bar of the GrokUI
Modified: grokui.base/trunk/src/grokui/base/configure.zcml
===================================================================
--- grokui.base/trunk/src/grokui/base/configure.zcml 2010-03-06 18:25:56 UTC (rev 109720)
+++ grokui.base/trunk/src/grokui/base/configure.zcml 2010-03-06 19:58:23 UTC (rev 109721)
@@ -2,10 +2,20 @@
xmlns:grok="http://namespaces.zope.org/grok"
xmlns="http://namespaces.zope.org/zope">
- <include package="grok" />
- <include package="grokcore.message" />
+ <include package="zope.security" file="meta.zcml" />
+ <include package="grokcore.component" file="meta.zcml" />
+ <include package="grokcore.viewlet" file="meta.zcml" />
+
+ <include package="grokcore.viewlet" />
<include package="megrok.menu" file="meta.zcml" />
<include package="megrok.layout" file="meta.zcml" />
+
+ <!-- Register the messaging utilities -->
+ <include package="grokcore.message" />
+
+ <!-- Declares the zope.ManageServices perm -->
+ <include package="zope.security" />
+
<grok:grok package="." />
</configure>
Modified: grokui.base/trunk/src/grokui/base/contentproviders.py
===================================================================
--- grokui.base/trunk/src/grokui/base/contentproviders.py 2010-03-06 18:25:56 UTC (rev 109720)
+++ grokui.base/trunk/src/grokui/base/contentproviders.py 2010-03-06 19:58:23 UTC (rev 109721)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-import grok
+import grokcore.viewlet as grok
from megrok.menu import Menu
from zope.site.interfaces import IRootFolder
from zope.component import getUtility, getMultiAdapter
Modified: grokui.base/trunk/src/grokui/base/layout.py
===================================================================
--- grokui.base/trunk/src/grokui/base/layout.py 2010-03-06 18:25:56 UTC (rev 109720)
+++ grokui.base/trunk/src/grokui/base/layout.py 2010-03-06 19:58:23 UTC (rev 109721)
@@ -1,12 +1,10 @@
# -*- coding: utf-8 -*-
-import grok
import megrok.menu
+import grokcore.view as grok
-from grok import util
from grokui.base import IGrokUIRealm, GrokUILayer, IUIPanel, MainMenu
from megrok.layout import Layout, Page
-from zope.component import getUtility
from zope.traversing.browser.absoluteurl import absoluteURL
grok.layer(GrokUILayer)
Modified: grokui.base/trunk/src/grokui/base/messages.py
===================================================================
--- grokui.base/trunk/src/grokui/base/messages.py 2010-03-06 18:25:56 UTC (rev 109720)
+++ grokui.base/trunk/src/grokui/base/messages.py 2010-03-06 19:58:23 UTC (rev 109721)
@@ -1,9 +1,16 @@
# -*- coding: utf-8 -*-
-import grok
+import grokcore.component as grok
from grokcore.message import UniqueMessageSource
+
class AdminMessageSource(UniqueMessageSource):
"""Source for the administration messages
"""
grok.name('admin')
+
+ def send(self, message, type="admin"):
+ return UniqueMessageSource.send(self, message, type=type)
+
+ def list(self, type="admin"):
+ return UniqueMessageSource.list(self, type=type)
Modified: grokui.base/trunk/src/grokui/base/namespace.py
===================================================================
--- grokui.base/trunk/src/grokui/base/namespace.py 2010-03-06 18:25:56 UTC (rev 109720)
+++ grokui.base/trunk/src/grokui/base/namespace.py 2010-03-06 19:58:23 UTC (rev 109721)
@@ -1,7 +1,8 @@
# -*- coding: utf-8 -*-
"""Components to keep Grok UI related stuff in a dedicated namespace.
"""
-import grok
+import grokcore.view as grok
+
from zope.site.interfaces import IRootFolder
from zope.location import LocationProxy
from zope.publisher.browser import applySkin
Modified: grokui.base/trunk/src/grokui/base/tests/ftesting.zcml
===================================================================
--- grokui.base/trunk/src/grokui/base/tests/ftesting.zcml 2010-03-06 18:25:56 UTC (rev 109720)
+++ grokui.base/trunk/src/grokui/base/tests/ftesting.zcml 2010-03-06 19:58:23 UTC (rev 109721)
@@ -1,11 +1,36 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:grok="http://namespaces.zope.org/grok"
+ xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="grok"
package="grokui.base">
+ <include package="grokcore.message" file="ftesting.zcml" />
+
+ <include package="zope.securitypolicy" file="meta.zcml" />
+ <include package="zope.principalregistry" file="meta.zcml" />
+ <include package="zope.publisher" file="meta.zcml" />
+ <include package="zope.browserpage" file="meta.zcml" />
+ <include package="zope.app.publication" file="meta.zcml" />
+ <include package="zope.app.pagetemplate" file="meta.zcml" />
+ <include package="grokcore.component" file="meta.zcml" />
+
+ <include package="zope.principalregistry" />
+ <include package="zope.annotation" />
+ <include package="zope.app.appsetup" />
+ <include package="zope.password" />
+ <include package="zope.container" />
+ <include package="zope.traversing" />
+ <include package="zope.contentprovider" />
+ <include package="zope.browserresource" />
+ <include package="zope.traversing.browser" />
+ <include package="zope.app.publication" />
+
+ <include package="grokcore.view" />
<include package="grokui.base" />
+ <browser:defaultView name="index.html" />
+
<securityPolicy
component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
/>
Modified: grokui.base/trunk/src/grokui/base/tests/test_layout.py
===================================================================
--- grokui.base/trunk/src/grokui/base/tests/test_layout.py 2010-03-06 18:25:56 UTC (rev 109720)
+++ grokui.base/trunk/src/grokui/base/tests/test_layout.py 2010-03-06 19:58:23 UTC (rev 109721)
@@ -53,7 +53,7 @@
</html>
"""
-import grok
+import grokcore.component as grok
import unittest
from grokui.base import GrokUIView
from grokui.base.tests import FunctionalLayer
Modified: grokui.base/trunk/src/grokui/base/viewlets.py
===================================================================
--- grokui.base/trunk/src/grokui/base/viewlets.py 2010-03-06 18:25:56 UTC (rev 109720)
+++ grokui.base/trunk/src/grokui/base/viewlets.py 2010-03-06 19:58:23 UTC (rev 109721)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-import grok
+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
More information about the checkins
mailing list