[Checkins] SVN: megrok.layout/trunk/ Now using grokcore.message

[Souheil CHELFOUH]

Log message for revision 117676:
  Now using grokcore.message

Changed:
  U   megrok.layout/trunk/docs/HISTORY.txt
  U   megrok.layout/trunk/setup.py
  U   megrok.layout/trunk/src/megrok/layout/components.py
  U   megrok.layout/trunk/src/megrok/layout/configure.zcml
  D   megrok.layout/trunk/src/megrok/layout/messages.py
  D   megrok.layout/trunk/src/megrok/layout/messages.zcml
  U   megrok.layout/trunk/src/megrok/layout/tests/models/message.py

-=-
Modified: megrok.layout/trunk/docs/HISTORY.txt
===================================================================
--- megrok.layout/trunk/docs/HISTORY.txt	2010-10-18 10:00:38 UTC (rev 117675)
+++ megrok.layout/trunk/docs/HISTORY.txt	2010-10-18 10:00:45 UTC (rev 117676)
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+1.1.0 (2010-03-03)
+------------------
+
+- ``z3c.flashmessage`` has been dropped in favor of
+  ``grokcore.message``. This new package takes in charge the
+  registration of the utilities and retains the existing API. The
+  back-compatibility is assured.
+
 1.0.2 (2010-02-26)
 ------------------
 

Modified: megrok.layout/trunk/setup.py
===================================================================
--- megrok.layout/trunk/setup.py	2010-10-18 10:00:38 UTC (rev 117675)
+++ megrok.layout/trunk/setup.py	2010-10-18 10:00:45 UTC (rev 117676)
@@ -17,7 +17,7 @@
     ]
 
 setup(name='megrok.layout',
-      version='1.0.2',
+      version='1.1',
       description="A layout component package for zope3 and Grok.",
       long_description = long_description,
       classifiers=[
@@ -42,11 +42,11 @@
       install_requires=[
           'grokcore.component',
           'grokcore.formlib',
+          'grokcore.message',
           'grokcore.security',
           'grokcore.view >= 1.13.1',
           'martian',
           'setuptools',
-          'z3c.flashmessage',
           'zope.component >= 3.9.1',
           'zope.interface',
           'zope.publisher',

Modified: megrok.layout/trunk/src/megrok/layout/components.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/components.py	2010-10-18 10:00:38 UTC (rev 117675)
+++ megrok.layout/trunk/src/megrok/layout/components.py	2010-10-18 10:00:45 UTC (rev 117676)
@@ -3,11 +3,11 @@
 
 import grokcore.component as grok
 import grokcore.formlib
+import grokcore.message
 import grokcore.view
 import zope.component
 
 from megrok.layout.interfaces import IPage, ILayout
-from z3c.flashmessage.interfaces import IMessageSource
 from zope.interface import Interface
 from zope.publisher.publish import mapply
 from zope.component.hooks import getSite
@@ -26,13 +26,9 @@
         return self.url(site, name)
 
     def flash(self, message, type='message'):
-        """Send a short message to the user.
+        """Sends a message to the session messager.
         """
-        source = zope.component.queryUtility(IMessageSource, name='session')
-        if source is None:
-            return None
-        source.send(message, type)
-        return True
+        return grokcore.message.send(message, type)
 
 
 class Layout(grokcore.view.ViewSupport, UtilityView):

Modified: megrok.layout/trunk/src/megrok/layout/configure.zcml
===================================================================
--- megrok.layout/trunk/src/megrok/layout/configure.zcml	2010-10-18 10:00:38 UTC (rev 117675)
+++ megrok.layout/trunk/src/megrok/layout/configure.zcml	2010-10-18 10:00:45 UTC (rev 117676)
@@ -5,5 +5,6 @@
   <include package="megrok.layout" file="meta.zcml" />
   <include package="grokcore.view" />
   <include package="grokcore.formlib" />
+  <include package="grokcore.message" />
 
 </configure>

Deleted: megrok.layout/trunk/src/megrok/layout/messages.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/messages.py	2010-10-18 10:00:38 UTC (rev 117675)
+++ megrok.layout/trunk/src/megrok/layout/messages.py	2010-10-18 10:00:45 UTC (rev 117676)
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-"""This module can be grokked if you need a generic flash message setup.
-"""
-import grokcore.component
-import z3c.flashmessage.sources
-import z3c.flashmessage.receiver
-
-
-grokcore.component.global_utility(
-    z3c.flashmessage.sources.SessionMessageSource, name='session')
-
-grokcore.component.global_utility(
-    z3c.flashmessage.receiver.GlobalMessageReceiver)

Deleted: megrok.layout/trunk/src/megrok/layout/messages.zcml
===================================================================
--- megrok.layout/trunk/src/megrok/layout/messages.zcml	2010-10-18 10:00:38 UTC (rev 117675)
+++ megrok.layout/trunk/src/megrok/layout/messages.zcml	2010-10-18 10:00:45 UTC (rev 117676)
@@ -1,8 +0,0 @@
-<configure
-   xmlns="http://namespaces.zope.org/zope"
-   xmlns:grok="http://namespaces.zope.org/grok">
-
-  <include package="grokcore.component" file="meta.zcml" />
-  <grok:grok package=".messages" />
-
-</configure>

Modified: megrok.layout/trunk/src/megrok/layout/tests/models/message.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/models/message.py	2010-10-18 10:00:38 UTC (rev 117675)
+++ megrok.layout/trunk/src/megrok/layout/tests/models/message.py	2010-10-18 10:00:45 UTC (rev 117676)
@@ -10,15 +10,13 @@
   >>> myform = getMultiAdapter((kitty, request), name='formutils')
 
   >>> print myview.flash(u'test')
-  None
+  Traceback (most recent call last):
+  ...
+  NoInteraction
 
-  >>> print myform.flash(u'some form message')
-  None
-
   >>> from zope.security.management import newInteraction
   >>> newInteraction(request)
 
-  >>> grok.testing.grok('megrok.layout.messages')
   >>> print myview.flash(u'test')
   True