X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/73b6a1639ba8f9f5fc7615c136364fdba73e5bb2..db3bea808bc78fa2d1c6d0be6e0300003f31059c:/src/ajaxable/utils.py

diff --git a/src/ajaxable/utils.py b/src/ajaxable/utils.py
index 82de84771..164feac34 100755
--- a/src/ajaxable/utils.py
+++ b/src/ajaxable/utils.py
@@ -1,13 +1,11 @@
-# -*- 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.
 #
 from functools import wraps
 
 from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden
-from django.shortcuts import render_to_response
-from django.template import RequestContext
-from django.utils.encoding import force_unicode
+from django.shortcuts import render
+from django.utils.encoding import force_text
 from django.utils.functional import Promise
 from django.utils.http import urlquote_plus
 import json
@@ -19,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
 
 
@@ -93,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
@@ -124,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)
@@ -153,7 +151,7 @@ class AjaxableFormView(object):
                 "view_kwargs": kwargs,
             }
         context.update(self.extra_context(request, obj))
-        return render_to_response(template, context, context_instance=RequestContext(request))
+        return render(request, template, context)
 
     def validate_object(self, obj, request):
         return None