X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f3e8dfa015744bd72796fdd8eff0d81f863cdc46..19bfea4bfc35c814854192e8bf67a6ad584f44c2:/src/wolnelektury/utils.py diff --git a/src/wolnelektury/utils.py b/src/wolnelektury/utils.py index 44973bb26..15319a11a 100644 --- a/src/wolnelektury/utils.py +++ b/src/wolnelektury/utils.py @@ -94,7 +94,7 @@ def ajax(login_required=False, method=None, template=None, permission_required=N if fun_kwargs or key in fun_params) kwargs.update(stringify_keys(request_params)) res = None - if login_required and not request.user.is_authenticated(): + if login_required and not request.user.is_authenticated: res = {'result': 'logout'} if (permission_required and not request.user.has_perm(permission_required)): @@ -118,8 +118,8 @@ def ajax(login_required=False, method=None, template=None, permission_required=N def send_noreply_mail(subject, message, recipient_list, **kwargs): send_mail( - u'[WolneLektury] ' + subject, - message + u"\n\n-- \n" + ugettext(u'Message sent automatically. Please do not reply.'), + '[WolneLektury] ' + subject, + message + "\n\n-- \n" + ugettext('Message sent automatically. Please do not reply.'), 'no-reply@wolnelektury.pl', recipient_list, **kwargs) @@ -159,17 +159,6 @@ def re_escape(s): return re.sub(r"[(){}\[\].*?|^$\\+-]", r"\\\g<0>", s) -BOT_BITS = ['bot', 'slurp', 'spider', 'facebook', 'crawler', 'parser', 'http'] - - -def is_crawler(request): - user_agent = request.META.get('HTTP_USER_AGENT') - if not user_agent: - return True - user_agent = user_agent.lower() - return any(bot_bit in user_agent for bot_bit in BOT_BITS) - - def get_cached_render_key(instance, property_name, language=None): if language is None: language = get_language()