Changeset 1585 for trunk/pylucid/PyLucid/system/page_msg.py

Timestamp:

05/23/08 16:33:49 (22 months ago)

Author:

JensDiemer

Message:

new page_msg system. Use a middleware to make page_msg lazy: ticket:193

• update settings_example.py (insert new middleware)
• change """contextpage_msg?""" to """request.page_msg"""
• add a simple page_msg unittest (Need more tests!)
• update _install data (Templates and index page)

Files:

• trunk/pylucid/PyLucid/system/page_msg.py (modified) (6 diffs)

trunk/pylucid/PyLucid/system/page_msg.py

@@ -33 +33 @@
 import os, sys, pprint, inspect
 
-from django.utils.safestring import mark_safe
+from django.utils.safestring import mark_safe, SafeData
+from django.utils.encoding import force_unicode
+
 from django.conf import settings
-
 
 from PyLucid.tools.utils import escape
@@ -46 +47 @@
     """
     def __init__(self, context):
+        request = context["request"]
+
         try:
-            self.messages = context["messages"]
-        except KeyError:
-            # No django messages inserted by RequestContext
-            # In the _install section we use no RequestContext ;)
+            self.messages = request.user.get_and_delete_messages()
+        except AttributeError:
+            # In the _install section we have no user
             self.messages = []
 
-        request = context["request"]
         self.debug_mode = getattr(request, "debug", False)
 
@@ -85 +86 @@
             color, self.prepare(*msg)
         )
-
         #~ self.request.user.message_set.create(message=msg)
         msg = mark_safe(msg) # turn djngo auto-escaping off
@@ -93 +93 @@
         """
         Append the fileinfo: Where from the announcement comes?
-        Only, if debug_mode is on.
         """
-        if self.debug_mode != True:
-            return ""
-
         try:
             self_basename = os.path.basename(__file__)
@@ -126 +122 @@
         -for dict, list use pprint ;)
         """
-        result = [self._get_fileinfo()]
+        if self.debug_mode == True:
+            result = [self._get_fileinfo()]
+        else:
+            result = []
 
         for item in msg:
@@ -141 +140 @@
 
         result = "".join(result)
-        return escape(result)
+        return result
 
     def encode_and_prepare(self, txt):
         """
-        returns the given txt as a string object.
+        Pass "safe" strings, all other would be escaped.
         """
-        if isinstance(txt, unicode):
-            return txt.encode(self._charset)
+        if isinstance(txt, SafeData):
+            return txt
 
-        # FIXME: Is that needed???
-        try:
-            return str(txt)
-        except:
-            return repr(txt)
+        if not isinstance(txt, unicode):
+            txt = force_unicode(txt)
+
+        return escape(txt)
+
+
+    #________________________________________________________________
+
+    def __repr__(self):
+        return "page messages: %s" % repr(self.messages)
+
+    def __str__(self):
+        return "pages messages: %s" % ", ".join(self.messages)
+
+    def __unicode__(self):
+        return u"page messages: %s" % u", ".join(self.messages)
 
     #________________________________________________________________