X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/98b2c09ef1f1c8288a31517f61423264c6b3291c..355e42e2b2244470ac6a5b9ad056e4a3f38f838c:/src/wolnelektury/utils.py diff --git a/src/wolnelektury/utils.py b/src/wolnelektury/utils.py index 8c5ead612..c65a172bd 100644 --- a/src/wolnelektury/utils.py +++ b/src/wolnelektury/utils.py @@ -1,25 +1,24 @@ -# -*- coding: utf-8 -*- # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # import codecs import csv -import cStringIO +from functools import wraps +from inspect import getargspec +from io import BytesIO import json import os -from functools import wraps - import pytz -from inspect import getargspec +import re 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.utils.translation import ugettext + tz = pytz.timezone(settings.TIME_ZONE) @@ -40,7 +39,7 @@ def makedirs(path): def stringify_keys(dictionary): return dict((keyword.encode('ascii'), value) - for keyword, value in dictionary.iteritems()) + for keyword, value in dictionary.items()) def json_encode(obj, sort_keys=True, ensure_ascii=False): @@ -87,7 +86,7 @@ def ajax(login_required=False, method=None, template=None, permission_required=N if request_params: request_params = dict( (key, json_decode_fallback(value)) - for key, value in request_params.iteritems() + for key, value in request_params.items() if fun_kwargs or key in fun_params) kwargs.update(stringify_keys(request_params)) res = None @@ -100,7 +99,7 @@ def ajax(login_required=False, method=None, template=None, permission_required=N 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: @@ -129,7 +128,7 @@ class UnicodeCSVWriter(object): def __init__(self, f, dialect=csv.excel, encoding="utf-8", **kwds): # Redirect output to a queue - self.queue = cStringIO.StringIO() + self.queue = BytesIO() self.writer = csv.writer(self.queue, dialect=dialect, **kwds) self.stream = f self.encoder = codecs.getincrementalencoder(encoding)() @@ -149,3 +148,19 @@ class UnicodeCSVWriter(object): 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)