flake8 compliance

This commit is contained in:
Christopher Neugebauer 2016-04-03 13:21:57 +10:00
parent 4d134e95d7
commit 7609965883
7 changed files with 9 additions and 19 deletions

View file

@ -6,7 +6,7 @@ import itertools
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.db import transaction from django.db import transaction
from django.db.models import Max, Sum from django.db.models import Max
from django.utils import timezone from django.utils import timezone
from registrasion import models as rego from registrasion import models as rego
@ -71,7 +71,6 @@ class CartController(object):
self.cart.revision += 1 self.cart.revision += 1
self.cart.save() self.cart.save()
@transaction.atomic @transaction.atomic
def set_quantities(self, product_quantities): def set_quantities(self, product_quantities):
''' Sets the quantities on each of the products on each of the ''' Sets the quantities on each of the products on each of the
@ -194,8 +193,6 @@ class CartController(object):
''' Determines whether the status of the current cart is valid; ''' Determines whether the status of the current cart is valid;
this is normally called before generating or paying an invoice ''' this is normally called before generating or paying an invoice '''
is_reserved = self.cart in rego.Cart.reserved_carts()
# TODO: validate vouchers # TODO: validate vouchers
items = rego.ProductItem.objects.filter(cart=self.cart) items = rego.ProductItem.objects.filter(cart=self.cart)

View file

@ -53,10 +53,4 @@ class CategoryController(object):
) )
cat_count = items.aggregate(Sum("quantity"))["quantity__sum"] or 0 cat_count = items.aggregate(Sum("quantity"))["quantity__sum"] or 0
cat_limit - cat_count
cat_limit = self.category.limit_per_user
if cat_limit is None:
return 999999 # We should probably work on this.
else:
return cat_limit - cat_count

View file

@ -3,7 +3,6 @@ import itertools
from collections import defaultdict from collections import defaultdict
from collections import namedtuple from collections import namedtuple
from django.db.models import Q
from django.db.models import Sum from django.db.models import Sum
from django.utils import timezone from django.utils import timezone
@ -64,8 +63,8 @@ class ConditionController(object):
"product_quantities") "product_quantities")
elif products is None: elif products is None:
products = set(i[0] for i in product_quantities) products = set(i[0] for i in product_quantities)
quantities = dict( (product, quantity) quantities = dict((product, quantity)
for product, quantity in product_quantities ) for product, quantity in product_quantities)
elif product_quantities is None: elif product_quantities is None:
products = set(products) products = set(products)
quantities = {} quantities = {}
@ -84,7 +83,6 @@ class ConditionController(object):
# if there are no mandatory conditions # if there are no mandatory conditions
non_mandatory = defaultdict(lambda: False) non_mandatory = defaultdict(lambda: False)
remainders = []
for condition in all_conditions: for condition in all_conditions:
cond = cls.for_condition(condition) cond = cls.for_condition(condition)
remainder = cond.user_quantity_remaining(user) remainder = cond.user_quantity_remaining(user)
@ -233,6 +231,7 @@ class TimeOrStockLimitConditionController(ConditionController):
return self.ceiling.limit - count return self.ceiling.limit - count
class TimeOrStockLimitEnablingConditionController( class TimeOrStockLimitEnablingConditionController(
TimeOrStockLimitConditionController): TimeOrStockLimitConditionController):

View file

@ -1,6 +1,5 @@
import itertools import itertools
from django.db.models import Q
from django.db.models import Sum from django.db.models import Sum
from registrasion import models as rego from registrasion import models as rego
@ -33,7 +32,9 @@ class ProductController(object):
passed_limits = set( passed_limits = set(
product product
for product in all_products for product in all_products
if CategoryController(product.category).user_quantity_remaining(user) > 0 if CategoryController(product.category).user_quantity_remaining(
user
) > 0
if cls(product).user_quantity_remaining(user) > 0 if cls(product).user_quantity_remaining(user) > 0
) )

View file

@ -3,6 +3,7 @@ from registrasion import models as rego
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
class TestingCartController(CartController): class TestingCartController(CartController):
def set_quantity(self, product, quantity, batched=False): def set_quantity(self, product, quantity, batched=False):

View file

@ -126,7 +126,6 @@ class RegistrationCartTestCase(SetTimeMixin, TestCase):
quantity=10, quantity=10,
).save() ).save()
@classmethod @classmethod
def new_voucher(self, code="VOUCHER", limit=1): def new_voucher(self, code="VOUCHER", limit=1):
voucher = rego.Voucher.objects.create( voucher = rego.Voucher.objects.create(

View file

@ -14,7 +14,6 @@ from django.contrib.auth.decorators import login_required
from django.contrib import messages from django.contrib import messages
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.db import transaction
from django.http import Http404 from django.http import Http404
from django.shortcuts import redirect from django.shortcuts import redirect
from django.shortcuts import render from django.shortcuts import render