X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d1d6ea8ed2889f871b6d89d4fae6021f286f921a..1227b1201c537ea17e310f0faab4ead7cf0d25af:/src/ajaxable/utils.py diff --git a/src/ajaxable/utils.py b/src/ajaxable/utils.py index 89dd0e2d9..164feac34 100755 --- a/src/ajaxable/utils.py +++ b/src/ajaxable/utils.py @@ -1,4 +1,3 @@ -# -*- 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. # @@ -6,7 +5,7 @@ from functools import wraps from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden from django.shortcuts import render -from django.utils.encoding import force_unicode +from django.utils.encoding import force_text from django.utils.functional import Promise from django.utils.http import urlquote_plus import json @@ -18,7 +17,7 @@ from honeypot.decorators import verify_honeypot_value class LazyEncoder(json.JSONEncoder): def default(self, obj): if isinstance(obj, Promise): - return force_unicode(obj) + return force_text(obj) return obj @@ -92,7 +91,7 @@ class AjaxableFormView(object): return response # do I need to be logged in? - if self.POST_login and not request.user.is_authenticated(): + if self.POST_login and not request.user.is_authenticated: return require_login(request) form_kwargs['data'] = request.POST @@ -123,7 +122,7 @@ class AjaxableFormView(object): if request.is_ajax(): return HttpResponse(LazyEncoder(ensure_ascii=False).encode(response_data)) else: - if self.POST_login and not request.user.is_authenticated() and not request.is_ajax(): + if self.POST_login and not request.user.is_authenticated and not request.is_ajax(): return require_login(request) form = self.form_class(*form_args, **form_kwargs)