Python 3, cleanups, fix register page logic

main/views/general.py

@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 from datetime import datetime, timedelta
 
-import settings
+from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
@@ -18,7 +18,8 @@ from main.utils import users_format_js, users_with_perm
 
 def register(request):
     products = Product.objects.filter(active=True)
-    cheapest_product_price = products.aggregate(Min('sale_price_int')).values()[0] or 0
+    cheapest_product_price = list(products.aggregate(Min('sale_price_int')).values())[0] or 0
+
     half_a_year_ago = datetime.now() - timedelta(days=180)
     users = User.objects.filter(profile__balance__gte=cheapest_product_price)
     # sort users after user's last purchase time
@@ -109,11 +110,7 @@ def deposit(request):
     allowed_users = users_with_perm('add_transaction')
     error_message_template = '{0} {1} kan ikke sette inn {2} kr, det overskrider maks saldo ({3} kr) med {4} kr'
 
-    # FIXME: dont need this
-    try:
-        limit_deposists = settings.BBS_LIMIT_DEPOSITS
-    except:
-        pass
+    limit_deposists = settings.BBS_LIMIT_DEPOSITS
 
     if request.method == "POST":
         form = DepositForm(request.POST)

main/views/stats.py

@@ -122,7 +122,7 @@ def stats_orders_hourly(request):
 
     response = {
         'start': str(orders[0].created),
-        'hourly': [[k, v] for k, v in f_hourly.iteritems()],
+        'hourly': [[k, v] for k, v in f_hourly.items()],
         'total': sum(f_hourly.values()),
     }
     return JsonResponse(response)
@@ -143,7 +143,7 @@ def stats_products_realtime(request):
             products[order_line.product].append([order_time_in_milliseconds, prev_entry[1] + order_line.amount])
 
     serialized_products = {}
-    for product, value in products.iteritems():
+    for product, value in products.items():
         serialized_products[product.name] = value
 
     response = {
@@ -168,9 +168,9 @@ def stats_products_per_user(request, user_id=None):
             products[order_line.product].append([order_time_in_milliseconds, prev_entry[1] + order_line.amount])
 
     serialized_products = []
-    for product, value in products.iteritems():
+    for product, value in products.items():
         serialized_products.append({
             'name': product.name,
             'data': value
         })
-    return JsonResponse(serialized_products)
+    return JsonResponse(serialized_products, safe=False)