X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/4e361d55331351f56077e5f9999ecb4ee7e93819..1c9e2865ce8c6ab51b2fa3e43d3661089e7b7eb8:/src/ajaxable/utils.py

diff --git a/src/ajaxable/utils.py b/src/ajaxable/utils.py
old mode 100755
new mode 100644
index 164feac34..3a1c4558a
--- a/src/ajaxable/utils.py
+++ b/src/ajaxable/utils.py
@@ -2,23 +2,24 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from functools import wraps
+import json
+from urllib.parse import quote_plus
 
 from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden
 from django.shortcuts import render
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.functional import Promise
-from django.utils.http import urlquote_plus
-import json
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.decorators.vary import vary_on_headers
 from honeypot.decorators import verify_honeypot_value
+from wolnelektury.utils import is_ajax
 
 
 class LazyEncoder(json.JSONEncoder):
-    def default(self, obj):
-        if isinstance(obj, Promise):
-            return force_text(obj)
-        return obj
+    def default(self, o):
+        if isinstance(o, Promise):
+            return force_str(o)
+        return o
 
 
 def method_decorator(function_decorator):
@@ -38,10 +39,9 @@ def method_decorator(function_decorator):
 
 def require_login(request):
     """Return 403 if request is AJAX. Redirect to login page if not."""
-    if request.is_ajax():
+    if is_ajax(request):
         return HttpResponseForbidden('Not logged in')
-    else:
-        return HttpResponseRedirect('/uzytkownicy/zaloguj')  # next?=request.build_full_path())
+    return HttpResponseRedirect('/uzytkownicy/zaloguj')  # next?=request.build_full_path())
 
 
 def placeholdized(form):
@@ -50,7 +50,7 @@ def placeholdized(form):
     return form
 
 
-class AjaxableFormView(object):
+class AjaxableFormView:
     """Subclass this to create an ajaxable view for any form.
 
     In the subclass, provide at least form_class.
@@ -105,10 +105,10 @@ class AjaxableFormView(object):
                     }
                 if add_args:
                     response_data.update(add_args)
-                if not request.is_ajax() and response_data['redirect']:
-                    return HttpResponseRedirect(urlquote_plus(
-                            response_data['redirect'], safe='/?=&'))
-            elif request.is_ajax():
+                if not is_ajax(request) and response_data['redirect']:
+                    return HttpResponseRedirect(quote_plus(
+                        response_data['redirect'], safe='/?=&'))
+            elif is_ajax(request):
                 # Form was sent with errors. Send them back.
                 if self.form_prefix:
                     errors = {}
@@ -119,17 +119,17 @@ class AjaxableFormView(object):
                 response_data = {'success': False, 'errors': errors}
             else:
                 response_data = None
-            if request.is_ajax():
+            if is_ajax(request):
                 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 is_ajax(request):
                 return require_login(request)
 
             form = self.form_class(*form_args, **form_kwargs)
             response_data = None
 
         title = self.title
-        if request.is_ajax():
+        if is_ajax(request):
             template = self.template
         else:
             template = self.full_template
@@ -139,17 +139,17 @@ class AjaxableFormView(object):
         if self.placeholdize:
             form = placeholdized(form)
         context = {
-                self.formname: form,
-                "title": title,
-                "honeypot": self.honeypot,
-                "placeholdize": self.placeholdize,
-                "submit": self.submit,
-                "action": self.action,
-                "response_data": response_data,
-                "ajax_template": self.template,
-                "view_args": args,
-                "view_kwargs": kwargs,
-            }
+            self.formname: form,
+            "title": title,
+            "honeypot": self.honeypot,
+            "placeholdize": self.placeholdize,
+            "submit": self.submit,
+            "action": self.action,
+            "response_data": response_data,
+            "ajax_template": self.template,
+            "view_args": args,
+            "view_kwargs": kwargs,
+        }
         context.update(self.extra_context(request, obj))
         return render(request, template, context)
 
@@ -158,13 +158,12 @@ class AjaxableFormView(object):
 
     def redirect_or_refresh(self, request, path, message=None):
         """If the form is AJAX, refresh the page. If not, go to `path`."""
-        if request.is_ajax():
+        if is_ajax(request):
             output = "<script>window.location.reload()</script>"
             if message:
                 output = "<div class='normal-text'>" + message + "</div>" + output
             return HttpResponse(output)
-        else:
-            return HttpResponseRedirect(path)
+        return HttpResponseRedirect(path)
 
     def get_object(self, request, *args, **kwargs):
         """Override to parse view args and get some associated data."""