Publishing tags, and fixes.

[wolnelektury.git] / src / wolnelektury / utils.py

diff --git a/src/wolnelektury/utils.py b/src/wolnelektury/utils.py
index 44973bb..33bf42c 100644 (file)
--- a/src/wolnelektury/utils.py
+++ b/src/wolnelektury/utils.py
@@ -8,28 +8,18 @@ from inspect import getargspec
 from io import BytesIO
 import json
 import os
 from io import BytesIO
 import json
 import os

-import pytz

 import re
 
 from django.conf import settings
 import re
 
 from django.conf import settings

+from django.contrib import admin

 from django.core.cache import cache
 from django.core.mail import send_mail
 from django.http import HttpResponse
 from django.template.loader import render_to_string
 from django.core.cache import cache
 from django.core.mail import send_mail
 from django.http import HttpResponse
 from django.template.loader import render_to_string

-from django.utils import timezone

 from django.utils.translation import get_language
 from django.conf import settings
 from django.utils.safestring import mark_safe
 from django.utils.translation import get_language
 from django.conf import settings
 from django.utils.safestring import mark_safe

-from django.utils.translation import ugettext
-
-
-tz = pytz.timezone(settings.TIME_ZONE)
-
-
-def localtime_to_utc(localtime):
-    return timezone.utc.normalize(
-        tz.localize(localtime)
-    )
+from django.utils.translation import gettext as _

 
 
 def utc_for_js(dt):
 
 
 def utc_for_js(dt):


@@ -94,7 +84,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 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)):
                     res = {'result': 'logout'}
                 if (permission_required and
                         not request.user.has_perm(permission_required)):


@@ -118,8 +108,8 @@ def ajax(login_required=False, method=None, template=None, permission_required=N
 
 def send_noreply_mail(subject, message, recipient_list, **kwargs):
     send_mail(
 
 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" + _('Message sent automatically. Please do not reply.'),

         'no-reply@wolnelektury.pl', recipient_list, **kwargs)
 
 
         'no-reply@wolnelektury.pl', recipient_list, **kwargs)
 
 


@@ -159,17 +149,6 @@ def re_escape(s):
     return re.sub(r"[(){}\[\].*?|^$\\+-]", r"\\\g<0>", 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()
 def get_cached_render_key(instance, property_name, language=None):
     if language is None:
         language = get_language()


@@ -207,3 +186,21 @@ def clear_cached_renders(bound_method):
                 lc
             )
         )
                 lc
             )
         )

+
+
+class YesNoFilter(admin.SimpleListFilter):
+    def lookups(self, request, model_admin):
+        return (
+            ('yes', _('Yes')),
+            ('no', _('No')),
+        )
+
+    def queryset(self, request, queryset):
+        if self.value() == 'yes':
+            return queryset.filter(self.q)
+        elif self.value() == 'no':
+            return queryset.exclude(self.q)
+
+
+def is_ajax(request):
+    return request.headers.get('x-requested-with') == 'XMLHttpRequest'