first steps in porting cashonly to Django 1.11

cashonly/admin.py

@@ -87,7 +87,7 @@ class AccountAdmin(admin.ModelAdmin):
 			                      'last': request.user.last_name}
 			if comment is not None and len(comment) > 0:
 				desc += ' (%s)' % (comment)
-			obj.change_credit(aount, subject, desc)
+			obj.change_credit(amount, subject, desc)
 
 		# Make sure the object is saved in any case
 		obj.save()

cashonly/templates/cashonly/base.html

@@ -76,7 +76,7 @@
 							(<span {% if user.account.credit < 0 %} style="color: red"{% endif %}>{{ user.account.credit|floatformat:2 }}€</span>)
 						</p>
 					</li>
-					<li><a href="{% url 'django.contrib.auth.views.logout_then_login' %}">{% trans "Logout" %}</a></li>
+					<li><a href="{% url 'logout_then_login' %}">{% trans "Logout" %}</a></li>
 				</ul>
 			</div>
 		</div>

cashonly/templates/cashonly/login.html

@@ -18,7 +18,7 @@
 
     <div class="container">
 
-      <form class="form-signin" method="post" action="{% url 'django.contrib.auth.views.login' %}">
+      <form class="form-signin" method="post" action="{% url 'login' %}">
 		{% csrf_token %}
 		<input type="hidden" name="next" value="{{ next }}" />
         <h2 class="form-signin-heading">{% trans "Please sign in" %}</h2>

cashonly/templates/cashonly/usersettings_saved.html

@@ -1,5 +1,4 @@
 {% extends "cashonly/base.html" %}
-{% load url from future %}
 {% load i18n %}
 
 {% block content %}

cashonly/urls.py

@@ -1,8 +1,8 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from cashonly import views
 
-urlpatterns = patterns('',
-	url(r'^/?$', 'cashonly.views.overview', name='overview'),
+urlpatterns = [
+	url(r'^$', views.overview, name='overview'),
 
 	url(r'^product/(?P<pk>\d+)/$', views.ProductView.as_view(), name='product'),
 
@@ -15,16 +15,16 @@ urlpatterns = patterns('',
 
 	url(r'products/((?P<category_id>\d+)/)?$', views.products, name='products'),
 
-	url(r'buy/(?P<product_id>\d+)/$', 'cashonly.views.buy', name='buy'),
+	url(r'buy/(?P<product_id>\d+)/$', views.buy, name='buy'),
 
-	url(r'buy/(?P<product_id>\d+)/really/$', 'cashonly.views.buy',
+	url(r'buy/(?P<product_id>\d+)/really/$', views.buy,
 	    {'confirm': True}, name='buy_really'),
 
-	url(r'buy/thanks/$', 'cashonly.views.buy_thanks', name='buy_thanks'),
+	url(r'buy/thanks/$', views.buy_thanks, name='buy_thanks'),
 
-	url(r'buy/error/$', 'cashonly.views.buy_error', name='buy_error'),
+	url(r'buy/error/$', views.buy_error, name='buy_error'),
 
-	url(r'usersettings(/(?P<submit>\w+))?/$', 'cashonly.views.usersettings',
+	url(r'usersettings(/(?P<submit>\w+))?/$', views.usersettings,
 	    name='usersettings'),
-)
+]
 

cashonly/views.py

@@ -1,8 +1,7 @@
 from django.views import generic
 from django import forms
-from django.shortcuts import render_to_response, get_object_or_404, redirect
+from django.shortcuts import render, get_object_or_404, redirect
 from django.contrib.auth.decorators import login_required
-from django.template import RequestContext
 from django.core import paginator
 from cashonly.models import *
 from django.utils.translation import ugettext as _
@@ -31,12 +30,10 @@ def overview(request):
         if len(products) == 3:
             break
 
-	context = RequestContext(request, { 'latest_transactions': transactions,
+    return render(request, 'cashonly/index.html',
+                  {'latest_transactions': transactions,
                    'latest_purchases': products})
 
-	return render_to_response('cashonly/index.html',
-	                          context_instance=context)
-
 
 class ProductView(generic.DetailView):
     model = Product
@@ -56,12 +53,9 @@ def transactions(request, detailed, page):
     except paginator.EmptyPage:
         transaction_list = paginator.page(paginator.num_pages)
 
-	context = RequestContext(request, { 'transaction_list': transaction_list,
+    return render(request, 'cashonly/transaction_list.html', { 'transaction_list': transaction_list,
                                         'detailed': detailed })
 
-	return render_to_response('cashonly/transaction_list.html',
-	                          context_instance=context)
-
 def products(request, category_id=None):
     if category_id is None:
         category = None
@@ -72,13 +66,10 @@ def products(request, category_id=None):
 
     categories = ProductCategory.objects.all()
 
-	context = RequestContext(request, { 'product_list': products,
+    return render(request, 'cashonly/product_list.html', { 'product_list': products,
                                         'category': category,
                                         'categories': categories })
 
-	return render_to_response('cashonly/product_list.html',
-	                          context_instance=context)
-
 @login_required
 def buy(request, product_id, confirm=False):
     product = get_object_or_404(Product, id=product_id)
@@ -89,19 +80,15 @@ def buy(request, product_id, confirm=False):
         else:
             return redirect('buy_error')
     else:
-		context = RequestContext(request, {'product': product})
-		return render_to_response('cashonly/buy_confirm.html',
-		                          context_instance=context)
+        return render(request, 'cashonly/buy_confirm.html', {'product': product})
 
 @login_required
 def buy_thanks(request):
-	context = RequestContext(request)
-	return render_to_response('cashonly/buy_thanks.html', context_instance=context)
+    return render(request, 'cashonly/buy_thanks.html')
 
 @login_required
 def buy_error(request):
-	context = RequestContext(request)
-	return render_to_response('cashonly/buy_error.html', context_instance=context)
+    return render(request, 'cashonly/buy_error.html')
 
 class UserSettingsForm(forms.Form):
     daily_digest = forms.BooleanField(required=False,
@@ -139,9 +126,7 @@ def usersettings(request, submit=None):
                 pin = pin_form.cleaned_data['pin']
                 request.user.account.pin = pin
                 request.user.account.save()
-				context = RequestContext(request)
-				return render_to_response('cashonly/usersettings_saved.html',
-				                          context_instance=context)
+                return render(request, 'cashonly/usersettings_saved.html')
 
         elif submit == 'settings':
             settings_form = UserSettingsForm(request.POST)
@@ -150,14 +135,10 @@ def usersettings(request, submit=None):
                 daily_digest = settings_form.cleaned_data['daily_digest']
                 request.user.account.daily_digest = daily_digest
                 request.user.account.save()
-				context = RequestContext(request)
-				return render_to_response('cashonly/usersettings_saved.html',
-				                          context_instance=context)
+                return render(request, 'cashonly/usersettings_saved.html')
 
-	context = RequestContext(request, { 'settings_form': settings_form,
+    return render(request, 'cashonly/usersettings.html', { 'settings_form': settings_form,
                                         'pin_form': pin_form})
-	return render_to_response('cashonly/usersettings.html',
-	                          context_instance=context)