Merge commit '9bea91a' into merge_small_prs

[osqa.git] / forum / user_messages / context_processors.py

diff --git a/forum/user_messages/context_processors.py b/forum/user_messages/context_processors.py
index 2bf2626981c530d51ac06c59c8543e97decc5899..b0681371bdffd2df0b6b9c75f1cee55f2f78a03c 100644 (file)
--- a/forum/user_messages/context_processors.py
+++ b/forum/user_messages/context_processors.py
@@ -6,47 +6,11 @@ Time-stamp: <2008-07-19 23:16:19 carljm context_processors.py>
 """
 from django.utils.encoding import StrAndUnicode
 
-from forum.user_messages import get_and_delete_messages
+from django.contrib.messages.api import get_messages
 
 def user_messages (request):
     """
     Returns session messages for the current session.
 
     """
-    messages = request.user.get_and_delete_messages()
-    #if request.user.is_authenticated():
-    #else:
-    #    messages = LazyMessages(request)
-    return { 'user_messages': messages }
-
-class LazyMessages (StrAndUnicode):
-    """
-    Lazy message container, so messages aren't actually retrieved from
-    session and deleted until the template asks for them.
-
-    """
-    def __init__(self, request):
-        self.request = request
-
-    def __iter__(self):
-        return iter(self.messages)
-
-    def __len__(self):
-        return len(self.messages)
-
-    def __nonzero__(self):
-        return bool(self.messages)
-
-    def __unicode__(self):
-        return unicode(self.messages)
-
-    def __getitem__(self, *args, **kwargs):
-        return self.messages.__getitem__(*args, **kwargs)
-
-    def _get_messages(self):
-        if hasattr(self, '_messages'):
-            return self._messages
-        self._messages = get_and_delete_messages(self.request)
-        return self._messages
-    messages = property(_get_messages)
-    
+    return { 'user_messages': get_messages(request) }