Python 3 fixes

main/views/stats.py

@@ -1,10 +1,12 @@
 from __future__ import unicode_literals
-from datetime import datetime, timedelta, time
+import time
+from datetime import datetime, timedelta
 from django.db.models import Sum, Count
 from django.http import JsonResponse
 from django.shortcuts import render, get_object_or_404
 from itertools import groupby
 
+from django.utils import six
 from main.models import Product, OrderLine, Order
 
 
@@ -61,7 +63,7 @@ def stats_product(product):
         f_per_user.append([who, num])
 
     response = {
-        'product': serialize_product(Product.objects.get(pk=product)) if type(product) is unicode else serialize_product(product),
+        'product': serialize_product(Product.objects.get(pk=product)) if type(product) in six.string_types else serialize_product(product),
         'counts': f_per_user,
         'total_counts': sum([row['num'] for row in per_user]),
     }

main/views/users.py

@@ -6,23 +6,17 @@ from django.contrib.auth.decorators import login_required
 from django.db import connection
 from django.db.models import Sum, Count
 from django.shortcuts import render, redirect
-from django.contrib.auth import logout as auth_logout
 from main.forms import SimpleCreateUserForm
 from main.models import Order
 from main.models import Transaction
 
 
-def logout(request):
-    auth_logout(request)
-    return render(request, 'registration/logout.html')
-
-
 def create_user(request):
     if request.method == "POST":
         form = SimpleCreateUserForm(data=request.POST)
         if form.is_valid():
             user = form.save()
-            messages.success(request, "Hurra! {0} {1} er lagt til".format(user.first_name, user.last_name))
+            messages.success(request, "Hurra! {} {} er lagt til".format(user.first_name, user.last_name))
             return redirect('create-user')
 
         else: