[Checkins] SVN: grokui.base/trunk/ remove the dependency of z3c.flashmessage, we now use grokcore.message
Christian Klinger
cklinger at novareto.de
Thu Mar 4 04:52:50 EST 2010
Log message for revision 109639:
remove the dependency of z3c.flashmessage, we now use grokcore.message
Changed:
U grokui.base/trunk/buildout.cfg
U grokui.base/trunk/setup.py
U grokui.base/trunk/src/grokui/base/configure.zcml
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/viewlets.py
-=-
Modified: grokui.base/trunk/buildout.cfg
===================================================================
--- grokui.base/trunk/buildout.cfg 2010-03-04 07:32:13 UTC (rev 109638)
+++ grokui.base/trunk/buildout.cfg 2010-03-04 09:52:49 UTC (rev 109639)
@@ -6,6 +6,7 @@
[versions]
zope.component = 3.9.1
+grokui.base =
[data]
recipe = zc.recipe.filestorage
Modified: grokui.base/trunk/setup.py
===================================================================
--- grokui.base/trunk/setup.py 2010-03-04 07:32:13 UTC (rev 109638)
+++ grokui.base/trunk/setup.py 2010-03-04 09:52:49 UTC (rev 109639)
@@ -48,7 +48,7 @@
'grok',
'megrok.layout',
'megrok.menu',
- 'z3c.flashmessage',
+ 'grokcore.message',
'zope.authentication',
'zope.browsermenu',
'zope.component',
Modified: grokui.base/trunk/src/grokui/base/configure.zcml
===================================================================
--- grokui.base/trunk/src/grokui/base/configure.zcml 2010-03-04 07:32:13 UTC (rev 109638)
+++ grokui.base/trunk/src/grokui/base/configure.zcml 2010-03-04 09:52:49 UTC (rev 109639)
@@ -3,6 +3,7 @@
xmlns="http://namespaces.zope.org/zope">
<include package="grok" />
+ <include package="grokcore.message" />
<include package="megrok.menu" file="meta.zcml" />
<include package="megrok.layout" file="meta.zcml" />
<grok:grok package="." />
Modified: grokui.base/trunk/src/grokui/base/layout.py
===================================================================
--- grokui.base/trunk/src/grokui/base/layout.py 2010-03-04 07:32:13 UTC (rev 109638)
+++ grokui.base/trunk/src/grokui/base/layout.py 2010-03-04 09:52:49 UTC (rev 109639)
@@ -2,7 +2,6 @@
import grok
import megrok.menu
-import z3c.flashmessage.interfaces
from grok import util
from grokui.base import IGrokUIRealm, GrokUILayer, IUIPanel, MainMenu
@@ -31,11 +30,3 @@
grok.context(IGrokUIRealm)
grok.implements(IUIPanel)
megrok.menu.menuitem(MainMenu)
-
- def application_url(self, name=None, data=None):
- return util.application_url(self.request, self.context, name, data)
-
- def flash(self, message, type='message'):
- source = getUtility(
- z3c.flashmessage.interfaces.IMessageSource, name='session')
- source.send(message, type)
Modified: grokui.base/trunk/src/grokui/base/messages.py
===================================================================
--- grokui.base/trunk/src/grokui/base/messages.py 2010-03-04 07:32:13 UTC (rev 109638)
+++ grokui.base/trunk/src/grokui/base/messages.py 2010-03-04 09:52:49 UTC (rev 109639)
@@ -2,8 +2,6 @@
import grok
from z3c.flashmessage.message import PersistentMessage
-from z3c.flashmessage.sources import SessionMessageSource
-from z3c.flashmessage.receiver import GlobalMessageReceiver
from z3c.flashmessage.interfaces import IMessageSource
@@ -29,7 +27,3 @@
self.message = None
else:
raise KeyError(message)
-
-
-grok.global_utility(GlobalMessageReceiver)
-grok.global_utility(SessionMessageSource, name='session')
Modified: grokui.base/trunk/src/grokui/base/viewlets.py
===================================================================
--- grokui.base/trunk/src/grokui/base/viewlets.py 2010-03-04 07:32:13 UTC (rev 109638)
+++ grokui.base/trunk/src/grokui/base/viewlets.py 2010-03-04 09:52:49 UTC (rev 109639)
@@ -2,7 +2,7 @@
import grok
from grokui.base import Header, Footer, Messages, IUIPanel, IGrokUIRealm
-from z3c.flashmessage.interfaces import IMessageReceiver
+from grokcore.message.utils import receive
from zope.browsermenu.interfaces import IBrowserMenu
from zope.authentication.interfaces import IUnauthenticatedPrincipal
from zope.component import getUtility
@@ -48,8 +48,7 @@
@property
def messages(self):
- receiver = getUtility(IMessageReceiver)
- return receiver.receive()
+ return receive()
class Authors(grok.Viewlet):
More information about the checkins
mailing list