diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-09-20 23:49:26 -0300 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-09-20 23:49:26 -0300 |
commit | 47cdfb6d8ec1141065e54349fe51338a67afd637 (patch) | |
tree | a1546b603bac4c873473df1bd7ba6342754e4ccc | |
parent | d2dcfcf906e8f87c78b4c20c4cae83fea5d0520a (diff) | |
download | askbot-47cdfb6d8ec1141065e54349fe51338a67afd637.tar.gz askbot-47cdfb6d8ec1141065e54349fe51338a67afd637.tar.bz2 askbot-47cdfb6d8ec1141065e54349fe51338a67afd637.zip |
pylinted files
-rw-r--r-- | askbot/conf/site_settings.py | 2 | ||||
-rw-r--r-- | askbot/const/message_keys.py | 7 | ||||
-rw-r--r-- | askbot/middleware/anon_user.py | 19 |
3 files changed, 16 insertions, 12 deletions
diff --git a/askbot/conf/site_settings.py b/askbot/conf/site_settings.py index 603ae6b9..0cab800b 100644 --- a/askbot/conf/site_settings.py +++ b/askbot/conf/site_settings.py @@ -5,8 +5,6 @@ keywords from askbot.conf.settings_wrapper import settings from askbot.deps import livesettings from django.utils.translation import ugettext as _ -from django.utils.html import escape -from askbot import const QA_SITE_SETTINGS = livesettings.ConfigurationGroup( 'QA_SITE_SETTINGS', diff --git a/askbot/const/message_keys.py b/askbot/const/message_keys.py index 5ba77248..12fa0766 100644 --- a/askbot/const/message_keys.py +++ b/askbot/const/message_keys.py @@ -11,13 +11,6 @@ _ = lambda v:v #because you don't want to import _ from here with import * __all__ = [] - - - - - - - #messages loaded in the templates via direct _ calls _('most relevant questions') _('click to see most relevant questions') diff --git a/askbot/middleware/anon_user.py b/askbot/middleware/anon_user.py index fe1ddf14..d6dd8b26 100644 --- a/askbot/middleware/anon_user.py +++ b/askbot/middleware/anon_user.py @@ -1,13 +1,25 @@ -from django.utils.translation import ugettext as _ +"""middleware that allows anonymous users +receive messages using the now deprecated `message_set()` +interface of the user objects. + +To allow anonymous users accept messages, a special +message manager is defined here, and :meth:`__deepcopy__()` method +added to the :class:`AnonymousUser` so that user could be pickled. + +Secondly, it sends greeting message to anonymous users. +""" from askbot.user_messages import create_message, get_and_delete_messages from askbot.conf import settings as askbot_settings -from askbot import const class AnonymousMessageManager(object): + """message manager for the anonymous user""" def __init__(self, request): self.request = request + def create(self, message=''): + """send message to anonymous user""" create_message(self.request, message) + def get_and_delete(self): messages = get_and_delete_messages(self.request) return messages @@ -19,6 +31,7 @@ def dummy_deepcopy(*arg): return None class ConnectToSessionMessagesMiddleware(object): + """middleware that attaches messages to anonymous users""" def process_request(self, request): if not request.user.is_authenticated(): #plug on deepcopy which may be called by django db "driver" @@ -31,5 +44,5 @@ class ConnectToSessionMessagesMiddleware(object): #also set the first greeting one time per session only if 'greeting_set' not in request.session: request.session['greeting_set'] = True - msg = _(askbot_settings.GREETING_FOR_ANONYMOUS_USER) + msg = askbot_settings.GREETING_FOR_ANONYMOUS_USER request.user.message_set.create(message=msg) |