Passing for Django 1.11.

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

diff --git a/src/wolnelektury/utils.py b/src/wolnelektury/utils.py
index 8c5ead6..142d33f 100644 (file)
--- a/src/wolnelektury/utils.py
+++ b/src/wolnelektury/utils.py
@@ -12,9 +12,9 @@ from functools import wraps
 import pytz
 from inspect import getargspec
 
 import pytz
 from inspect import getargspec
 

+import re

 from django.core.mail import send_mail
 from django.http import HttpResponse
 from django.core.mail import send_mail
 from django.http import HttpResponse

-from django.template import RequestContext

 from django.template.loader import render_to_string
 from django.utils import timezone
 from django.conf import settings
 from django.template.loader import render_to_string
 from django.utils import timezone
 from django.conf import settings


@@ -100,7 +100,7 @@ def ajax(login_required=False, method=None, template=None, permission_required=N
                 try:
                     res = fun(request, **kwargs)
                     if res and template:
                 try:
                     res = fun(request, **kwargs)
                     if res and template:

-                        res = {'html': render_to_string(template, res, RequestContext(request))}
+                        res = {'html': render_to_string(template, res, request=request)}

                 except AjaxError as e:
                     res = {'result': e.args[0]}
             if 'result' not in res:
                 except AjaxError as e:
                     res = {'result': e.args[0]}
             if 'result' not in res:


@@ -149,3 +149,19 @@ class UnicodeCSVWriter(object):
     def writerows(self, rows):
         for row in rows:
             self.writerow(row)
     def writerows(self, rows):
         for row in rows:
             self.writerow(row)

+
+
+# the original re.escape messes with unicode
+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)