PEP8 fixes

Makefile

@@ -22,7 +22,7 @@ ci:
 	pip install -r requirements.txt
 	./runtests.py --with-coverage --with-xunit
 	coverage xml
-	flake8 oscar | perl -ple "s/: /: [E] /" | grep -v migrations > violations.txt
+	flake8 --ignore=W292 oscar | perl -ple "s/: /: [E] /" | grep -v migrations > violations.txt
 
 test:
 	./runtests.py

oscar/apps/address/admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django.db.models import get_model
 
+
 class UserAddressAdmin(admin.ModelAdmin):
     exclude = ('search_text', 'hash')
     readonly_fields = ('num_orders',)

oscar/apps/address/forms.py

@@ -8,4 +8,4 @@ class UserAddressForm(ModelForm):
 
     class Meta:
         model = UserAddress
-        exclude = ('user', 'num_orders', 'hash', 'search_text')
+        exclude = ('user', 'num_orders', 'hash', 'search_text')

oscar/apps/address/models.py

@@ -1,4 +1,5 @@
-from oscar.apps.address.abstract_models import AbstractUserAddress, AbstractCountry
+from oscar.apps.address.abstract_models import (
+    AbstractUserAddress, AbstractCountry)
 
 
 class UserAddress(AbstractUserAddress):
@@ -6,4 +7,4 @@ class UserAddress(AbstractUserAddress):
 
 
 class Country(AbstractCountry):
-    pass
+    pass

oscar/apps/analytics/abstract_models.py

@@ -7,21 +7,24 @@ from django.utils.translation import ugettext as _
 class AbstractProductRecord(models.Model):
     """
     A record of a how popular a product is.
-    
+
     This used be auto-merchandising to display the most popular
     products.
     """
-    
-    product = models.OneToOneField('catalogue.Product', verbose_name=_("Product"))
-    
+
+    product = models.OneToOneField(
+        'catalogue.Product', verbose_name=_("Product"))
+
     # Data used for generating a score
     num_views = models.PositiveIntegerField(_('Views'), default=0)
-    num_basket_additions = models.PositiveIntegerField(_('Basket Additions'), default=0)
-    num_purchases = models.PositiveIntegerField(_('Purchaes'), default=0, db_index=True)
-    
+    num_basket_additions = models.PositiveIntegerField(
+        _('Basket Additions'), default=0)
+    num_purchases = models.PositiveIntegerField(
+        _('Purchaes'), default=0, db_index=True)
+
     # Product score - used within search
     score = models.FloatField(_('Score'), default=0.00)
-    
+
     class Meta:
         abstract = True
         ordering = ['-num_purchases']
@@ -30,26 +33,33 @@ class AbstractProductRecord(models.Model):
 
     def __unicode__(self):
         return _("Record for '%s'") % self.product
-        
+
 
 class AbstractUserRecord(models.Model):
     """
     A record of a user's activity.
     """
-    
+
     user = models.OneToOneField('auth.User', verbose_name=_("User"))
-    
+
     # Browsing stats
-    num_product_views = models.PositiveIntegerField(_('Product Views'), default=0)
-    num_basket_additions = models.PositiveIntegerField(_('Basket Additions'), default=0)
-    
+    num_product_views = models.PositiveIntegerField(
+        _('Product Views'), default=0)
+    num_basket_additions = models.PositiveIntegerField(
+        _('Basket Additions'), default=0)
+
     # Order stats
-    num_orders = models.PositiveIntegerField(_('Orders'), default=0, db_index=True)
-    num_order_lines = models.PositiveIntegerField(_('Order Lines'), default=0, db_index=True)
-    num_order_items = models.PositiveIntegerField(_('Order Items'), default=0, db_index=True)
-    total_spent = models.DecimalField(_('Total Spent'), decimal_places=2, max_digits=12, default=Decimal('0.00'))
-    date_last_order = models.DateTimeField(_('Last Order Date'), blank=True, null=True)
-    
+    num_orders = models.PositiveIntegerField(
+        _('Orders'), default=0, db_index=True)
+    num_order_lines = models.PositiveIntegerField(
+        _('Order Lines'), default=0, db_index=True)
+    num_order_items = models.PositiveIntegerField(
+        _('Order Items'), default=0, db_index=True)
+    total_spent = models.DecimalField(_('Total Spent'), decimal_places=2,
+                                      max_digits=12, default=Decimal('0.00'))
+    date_last_order = models.DateTimeField(
+        _('Last Order Date'), blank=True, null=True)
+
     class Meta:
         abstract = True
         verbose_name = _('User Record')
@@ -57,34 +67,32 @@ class AbstractUserRecord(models.Model):
 
 
 class AbstractUserProductView(models.Model):
-    
+
     user = models.ForeignKey('auth.User', verbose_name=_("User"))
     product = models.ForeignKey('catalogue.Product', verbose_name=_("Product"))
     date_created = models.DateTimeField(_("Date Created"), auto_now_add=True)
-     
+
     class Meta:
         abstract = True
         verbose_name = _('Basket')
         verbose_name_plural = _('Baskets')
 
-
     def __unicode__(self):
         return _("%(user)s viewed '%(product)s'") % {
-            'user':self.user, 'product':self.product}
-             
+            'user': self.user, 'product': self.product}
+
 
 class AbstractUserSearch(models.Model):
-    
+
     user = models.ForeignKey('auth.User', verbose_name=_("User"))
     query = models.CharField(_("Search term"), max_length=255, db_index=True)
     date_created = models.DateTimeField(_("Date Created"), auto_now_add=True)
-     
+
     class Meta:
         abstract = True
         verbose_name_plural = _("User search queries")
-        
+
     def __unicode__(self):
         return _("%(user)s searched for '%(query)s'") % {
             'user': self.user,
-            'query': self.query
-        }
+            'query': self.query}

oscar/apps/analytics/admin.py

@@ -3,18 +3,22 @@ from django.db.models import get_model
 
 
 class ProductRecordAdmin(admin.ModelAdmin):
-    list_display = ('product', 'num_views', 'num_basket_additions', 'num_purchases')
-    
+    list_display = ('product', 'num_views', 'num_basket_additions',
+                    'num_purchases')
+
 
 class UserProductViewAdmin(admin.ModelAdmin):
     list_display = ('user', 'product', 'date_created')
 
 
 class UserRecordAdmin(admin.ModelAdmin):
-    list_display = ('user', 'num_product_views', 'num_basket_additions', 'num_orders', 'total_spent', 'date_last_order')
+    list_display = ('user', 'num_product_views', 'num_basket_additions',
+                    'num_orders', 'total_spent', 'date_last_order')
 
 
-admin.site.register(get_model('analytics', 'productrecord'), ProductRecordAdmin)
+admin.site.register(get_model('analytics', 'productrecord'),
+                    ProductRecordAdmin)
 admin.site.register(get_model('analytics', 'userrecord'), UserRecordAdmin)
 admin.site.register(get_model('analytics', 'usersearch'))
-admin.site.register(get_model('analytics', 'userproductview'), UserProductViewAdmin)
+admin.site.register(get_model('analytics', 'userproductview'),
+                    UserProductViewAdmin)

oscar/apps/analytics/models.py

@@ -1,5 +1,6 @@
-from oscar.apps.analytics.abstract_models import (AbstractProductRecord, AbstractUserRecord,
-                                                  AbstractUserProductView, AbstractUserSearch)
+from oscar.apps.analytics.abstract_models import (
+    AbstractProductRecord, AbstractUserRecord,
+    AbstractUserProductView, AbstractUserSearch)
 
 
 class ProductRecord(AbstractProductRecord):

oscar/apps/analytics/receivers.py

@@ -16,58 +16,71 @@ order_placed = get_class('order.signals', 'order_placed')
 
 logger = logging.getLogger('oscar.analytics')
 
+
 def _record_product_view(product):
     try:
-        record,_ = ProductRecord.objects.get_or_create(product=product)
+        record, __ = ProductRecord.objects.get_or_create(product=product)
         record.num_views += 1
         record.save()
     except IntegrityError:
-        # get_or_create sometimes fails due to MySQL's weird transactions, fail silently
-        logger.error("IntegrityError on ProductRecord.objects.get_or_create(product=product)")
-    
+        # get_or_create sometimes fails due to MySQL's weird transactions, fail
+        # silently
+        logger.error("IntegrityError on ProductRecord.objects."
+                     "get_or_create(product=product)")
+
+
 def _record_user_product_view(user, product):
     if user.is_authenticated():
         # Update user record
         try:
-            record,_ = UserRecord.objects.get_or_create(user=user)
+            record, __ = UserRecord.objects.get_or_create(user=user)
             record.num_product_views += 1
             record.save()
         except IntegrityError:
-            logger.error("IntegrityError on UserRecord.objects.get_or_create(user=user)")
-        
+            logger.error("IntegrityError on UserRecord.objects."
+                         "get_or_create(user=user)")
+
         # Add user product view record
         UserProductView.objects.create(product=product, user=user)
 
+
 def _record_basket_addition(product):
     try:
-        record,_ = ProductRecord.objects.get_or_create(product=product)
+        record, __ = ProductRecord.objects.get_or_create(product=product)
         record.num_basket_additions += 1
         record.save()
     except IntegrityError:
-        logger.error("IntegrityError on ProductRecord.objects.get_or_create(product=product)")
-    
+        logger.error("IntegrityError on ProductRecord.objects."
+                     "get_or_create(product=product)")
+
+
 def _record_user_basket_addition(user, product):
     if user.is_authenticated():
         try:
-            record,_ = UserRecord.objects.get_or_create(user=user)
+            record, __ = UserRecord.objects.get_or_create(user=user)
             record.num_basket_additions += 1
             record.save()
         except IntegrityError:
-            logger.error("IntegrityError on UserRecord.objects.get_or_create(user=user)")
+            logger.error("IntegrityError on UserRecord.objects."
+                         "get_or_create(user=user)")
+
 
 def _record_products_in_order(order):
     for line in order.lines.all():
         try:
-            record,_ = ProductRecord.objects.get_or_create(product=line.product)
+            record, __ = ProductRecord.objects.get_or_create(
+                product=line.product)
             record.num_purchases += line.quantity
             record.save()
         except IntegrityError:
-            logger.error("IntegrityError on ProductRecord.objects.get_or_create(product=product)")
+            logger.error("IntegrityError on ProductRecord.objects."
+                         "get_or_create(product=product)")
+
 
 def _record_user_order(user, order):
     if user.is_authenticated():
         try:
-            record,_ = UserRecord.objects.get_or_create(user=user)
+            record, __ = UserRecord.objects.get_or_create(user=user)
             record.num_orders += 1
             record.num_order_lines += order.num_lines
             record.num_order_items += order.num_items
@@ -75,7 +88,9 @@ def _record_user_order(user, order):
             record.date_last_order = order.date_placed
             record.save()
         except IntegrityError:
-            logger.error("IntegrityError on UserRecord.objects.get_or_create(user=user)")
+            logger.error("IntegrityError on UserRecord.objects."
+                         "get_or_create(user=user)")
+
 
 def _record_user_product_search(user, query):
     if user.is_authenticated():
@@ -83,20 +98,24 @@ def _record_user_product_search(user, query):
 
 # Receivers
 
+
 @receiver(product_viewed)
 def receive_product_view(sender, product, user, **kwargs):
     _record_product_view(product)
     _record_user_product_view(user, product)
-    
+
+
 @receiver(product_search)
 def receive_product_search(sender, query, user, **kwargs):
     _record_user_product_search(user, query)
-    
+
+
 @receiver(basket_addition)
 def receive_basket_addition(sender, product, user, **kwargs):
     _record_basket_addition(product)
     _record_user_basket_addition(user, product)
-    
+
+
 @receiver(order_placed)
 def receive_order_placed(sender, order, user, **kwargs):
     _record_products_in_order(order)

oscar/apps/analytics/reports.py

@@ -6,8 +6,10 @@ from django.utils.translation import ugettext_lazy as _
 from oscar.core.loading import get_class
 
 ReportGenerator = get_class('dashboard.reports.reports', 'ReportGenerator')
-ReportCSVFormatter = get_class('dashboard.reports.reports', 'ReportCSVFormatter')
-ReportHTMLFormatter = get_class('dashboard.reports.reports', 'ReportHTMLFormatter')
+ReportCSVFormatter = get_class('dashboard.reports.reports',
+                               'ReportCSVFormatter')
+ReportHTMLFormatter = get_class('dashboard.reports.reports',
+                                'ReportHTMLFormatter')
 ProductRecord = get_model('analytics', 'ProductRecord')
 UserRecord = get_model('analytics', 'UserRecord')
 
@@ -41,8 +43,7 @@ class ProductReportGenerator(ReportGenerator):
 
     formatters = {
         'CSV_formatter': ProductReportCSVFormatter,
-        'HTML_formatter': ProductReportHTMLFormatter
-    }
+        'HTML_formatter': ProductReportHTMLFormatter}
 
     def report_description(self):
         return self.description
@@ -68,8 +69,7 @@ class UserReportCSVFormatter(ReportCSVFormatter):
                       _('Order lines'),
                       _('Order items'),
                       _('Total spent'),
-                      _('Date of last order')
-                      ]
+                      _('Date of last order')]
         writer.writerow(header_row)
 
         for record in users:
@@ -95,8 +95,7 @@ class UserReportGenerator(ReportGenerator):
 
     formatters = {
         'CSV_formatter': UserReportCSVFormatter,
-        'HTML_formatter': UserReportHTMLFormatter
-    }
+        'HTML_formatter': UserReportHTMLFormatter}
 
     def generate(self):
         users = UserRecord._default_manager.select_related().all()

oscar/apps/analytics/scores.py

@@ -6,36 +6,38 @@ Product = get_model('catalogue', 'Product')
 
 
 class Calculator(object):
-    
+
     # Map of field name to weight
     weights = {'num_views': 1,
                'num_basket_additions': 3,
                'num_purchases': 5}
-    
+
     def __init__(self, logger):
         self.logger = logger
         self.cursor = connection.cursor()
-    
+
     def run(self):
         self.calculate_scores()
         self.update_product_models()
-        
+
     def calculate_scores(self):
         self.logger.info("Calculating product scores")
-        
+
         # Build the "SET ..." part of the SQL statement
-        weighted_sum = " + ".join(["%s*`%s`" % (weight, field) for field, weight in self.weights.items()])
-        
+        weighted_sum = " + ".join(
+            ["%s*`%s`" % (weight, field) for field, weight
+             in self.weights.items()])
+
         ctx = {'table': ProductRecord._meta.db_table,
                'weighted_total': weighted_sum,
                'total_weight': sum(self.weights.values())}
-        sql = '''UPDATE `%(table)s` 
+        sql = '''UPDATE `%(table)s`
                  SET score = %(weighted_total)s / %(total_weight)s''' % ctx
 
         self.logger.debug(sql)
         self.cursor.execute(sql)
         transaction.commit_unless_managed()
-        
+
     def update_product_models(self):
         self.logger.info("Updating product records")
         qs = ProductRecord.objects.all()
@@ -43,4 +45,3 @@ class Calculator(object):
             record.product.score = record.score
             record.product.save()
         self.logger.info("Updated scores for %d products" % qs.count())
-        

oscar/apps/basket/abstract_models.py

@@ -14,7 +14,8 @@ from oscar.templatetags.currency_filters import currency
 # Basket statuses
 # - Frozen is for when a basket is in the process of being submitted
 #   and we need to prevent any changes to it.
-OPEN, MERGED, SAVED, FROZEN, SUBMITTED = ("Open", "Merged", "Saved", "Frozen", "Submitted")
+OPEN, MERGED, SAVED, FROZEN, SUBMITTED = (
+    "Open", "Merged", "Saved", "Frozen", "Submitted")
 
 
 class AbstractBasket(models.Model):
@@ -22,7 +23,8 @@ class AbstractBasket(models.Model):
     Basket object
     """
     # Baskets can be anonymously owned (which are merged if the user signs in)
-    owner = models.ForeignKey('auth.User', related_name='baskets', null=True, verbose_name=_("Owner"))
+    owner = models.ForeignKey('auth.User', related_name='baskets',
+                              null=True, verbose_name=_("Owner"))
     STATUS_CHOICES = (
         (OPEN, _("Open - currently active")),
         (MERGED, _("Merged - superceded by another basket")),
@@ -30,12 +32,15 @@ class AbstractBasket(models.Model):
         (FROZEN, _("Frozen - the basket cannot be modified")),
         (SUBMITTED, _("Submitted - has been ordered at the checkout")),
     )
-    status = models.CharField(_("Status"), max_length=128, default=OPEN, choices=STATUS_CHOICES)
-    vouchers = models.ManyToManyField('voucher.Voucher', null=True, verbose_name=_("Vouchers"))
+    status = models.CharField(_("Status"), max_length=128, default=OPEN,
+                              choices=STATUS_CHOICES)
+    vouchers = models.ManyToManyField('voucher.Voucher', null=True,
+                                      verbose_name=_("Vouchers"))
 
     date_created = models.DateTimeField(_("Date Created"), auto_now_add=True)
     date_merged = models.DateTimeField(_("Date Merged"), null=True, blank=True)
-    date_submitted = models.DateTimeField(_("Date Submitted"), null=True, blank=True)
+    date_submitted = models.DateTimeField(_("Date Submitted"), null=True,
+                                          blank=True)
 
     class Meta:
         abstract = True
@@ -55,15 +60,18 @@ class AbstractBasket(models.Model):
         self.exempt_from_tax = False
 
     def __unicode__(self):
-        return _(u"%(status)s basket (owner: %(owner)s, lines: %(num_lines)d)") % {
-            'status': self.status, 'owner': self.owner, 'num_lines': self.num_lines}
+        return _(
+            u"%(status)s basket (owner: %(owner)s, lines: %(num_lines)d)") % {
+                'status': self.status,
+                'owner': self.owner,
+                'num_lines': self.num_lines}
 
     def all_lines(self):
         """
         Return a cached set of basket lines.
 
-        This is important for offers as they alter the line models and you don't
-        want to reload them from the DB.
+        This is important for offers as they alter the line models and you
+        don't want to reload them from the DB.
         """
         if self.id is None:
             return query.EmptyQuerySet(model=self.__class__)
@@ -77,12 +85,13 @@ class AbstractBasket(models.Model):
             total_basket_quantity = self.num_items
             max_allowed = basket_threshold - total_basket_quantity
             if qty > max_allowed:
-                return False, _("Due to technical limitations we are not able "
-                                "to ship more than %(threshold)d items in one order."
-                                " Your basket currently has %(basket)d items.") % {
-                                        'threshold': basket_threshold,
-                                        'basket': total_basket_quantity,
-                                    }
+                return False, _(
+                    "Due to technical limitations we are not able "
+                    "to ship more than %(threshold)d items in one order."
+                    " Your basket currently has %(basket)d items.") % {
+                        'threshold': basket_threshold,
+                        'basket': total_basket_quantity,
+                    }
         return True, None
 
     # ============
@@ -101,7 +110,8 @@ class AbstractBasket(models.Model):
         Add a product to the basket
 
         The 'options' list should contains dicts with keys 'option' and 'value'
-        which link the relevant product.Option model and string value respectively.
+        which link the relevant product.Option model and string value
+        respectively.
         """
         if options is None:
             options = []
@@ -112,8 +122,8 @@ class AbstractBasket(models.Model):
         # product (eg T-shirts with different personalisations)
         line_ref = self._create_line_reference(product, options)
 
-        # Determine price to store (if one exists).  It is only stored for audit
-        # and sometimes caching.
+        # Determine price to store (if one exists).  It is only stored for
+        # audit and sometimes caching.
         price_excl_tax, price_incl_tax = None, None
         if product.has_stockrecord:
             stockrecord = product.stockrecord
@@ -121,11 +131,12 @@ class AbstractBasket(models.Model):
                 price_excl_tax = getattr(stockrecord, 'price_excl_tax', None)
                 price_incl_tax = getattr(stockrecord, 'price_incl_tax', None)
 
-        line, created = self.lines.get_or_create(line_reference=line_ref,
-                                                 product=product,
-                                                 defaults={'quantity': quantity,
-                                                           'price_excl_tax': price_excl_tax,
-                                                           'price_incl_tax': price_incl_tax})
+        line, created = self.lines.get_or_create(
+            line_reference=line_ref,
+            product=product,
+            defaults={'quantity': quantity,
+                      'price_excl_tax': price_excl_tax,
+                      'price_incl_tax': price_incl_tax})
         if created:
             for option_dict in options:
                 line.attributes.create(option=option_dict['option'],
@@ -168,11 +179,13 @@ class AbstractBasket(models.Model):
             line.basket = self
             line.save()
         else:
-            # Line already exists - assume the max quantity is correct and delete the old
+            # Line already exists - assume the max quantity is correct and
+            # delete the old
             if add_quantities:
                 existing_line.quantity += line.quantity
             else:
-                existing_line.quantity = max(existing_line.quantity, line.quantity)
+                existing_line.quantity = max(existing_line.quantity,
+                                             line.quantity)
             existing_line.save()
             line.delete()
 
@@ -316,8 +329,8 @@ class AbstractBasket(models.Model):
     @property
     def grouped_voucher_discounts(self):
         """
-        Return discounts from vouchers but grouped so that a voucher which links
-        to multiple offers is aggregated into one object.
+        Return discounts from vouchers but grouped so that a voucher which
+        links to multiple offers is aggregated into one object.
         """
         voucher_discounts = {}
         for discount in self.voucher_discounts:
@@ -347,7 +360,8 @@ class AbstractBasket(models.Model):
     @property
     def num_items(self):
         """Return number of items"""
-        return reduce(lambda num,line: num+line.quantity, self.all_lines(), 0)
+        return reduce(
+            lambda num, line: num + line.quantity, self.all_lines(), 0)
 
     @property
     def num_items_without_discount(self):
@@ -395,24 +409,29 @@ class AbstractLine(models.Model):
     """
     A line of a basket (product and a quantity)
     """
-    basket = models.ForeignKey('basket.Basket', related_name='lines', verbose_name=_("Basket"))
+    basket = models.ForeignKey('basket.Basket', related_name='lines',
+                               verbose_name=_("Basket"))
 
     # This is to determine which products belong to the same line
     # We can't just use product.id as you can have customised products
     # which should be treated as separate lines.  Set as a
     # SlugField as it is included in the path for certain views.
-    line_reference = models.SlugField(_("Line Reference"), max_length=128, db_index=True)
+    line_reference = models.SlugField(_("Line Reference"), max_length=128,
+                                      db_index=True)
 
-    product = models.ForeignKey('catalogue.Product', related_name='basket_lines', verbose_name=_("Product"))
+    product = models.ForeignKey(
+        'catalogue.Product', related_name='basket_lines',
+        verbose_name=_("Product"))
     quantity = models.PositiveIntegerField(_('Quantity'), default=1)
 
     # We store the unit price incl tax of the product when it is first added to
-    # the basket.  This allows us to tell if a product has changed price since a
-    # person first added it to their basket.
-    price_excl_tax = models.DecimalField(_('Price excl. Tax'), decimal_places=2, max_digits=12,
-                                         null=True)
-    price_incl_tax = models.DecimalField(_('Price incl. Tax'), decimal_places=2, max_digits=12,
-                                         null=True)
+    # the basket.  This allows us to tell if a product has changed price since
+    # a person first added it to their basket.
+    price_excl_tax = models.DecimalField(
+        _('Price excl. Tax'), decimal_places=2, max_digits=12,
+        null=True)
+    price_incl_tax = models.DecimalField(
+        _('Price incl. Tax'), decimal_places=2, max_digits=12, null=True)
     # Track date of first addition
     date_created = models.DateTimeField(_("Date Created"), auto_now_add=True)
 
@@ -428,13 +447,18 @@ class AbstractLine(models.Model):
         verbose_name_plural = _('Basket lines')
 
     def __unicode__(self):
-        return _(u"%(basket)s, Product '%(product)s', quantity %(quantity)d") % {
-            'basket': self.basket, 'product': self.product, 'quantity': self.quantity}
+        return _(
+            u"%(basket)s, Product '%(product)s', quantity %(quantity)d") % {
+                'basket': self.basket,
+                'product': self.product,
+                'quantity': self.quantity}
 
     def save(self, *args, **kwargs):
         """Saves a line or deletes if it's quanity is 0"""
         if self.basket.status not in (OPEN, SAVED):
-            raise PermissionDenied(_("You cannot modify a %s basket") % self.basket.status.lower())
+            raise PermissionDenied(
+                _("You cannot modify a %s basket") % (
+                    self.basket.status.lower(),))
         if self.quantity == 0:
             return self.delete(*args, **kwargs)
         super(AbstractLine, self).save(*args, **kwargs)
@@ -471,17 +495,21 @@ class AbstractLine(models.Model):
         """
         prices = []
         if not self.has_discount:
-            prices.append((self.unit_price_incl_tax, self.unit_price_excl_tax, self.quantity))
+            prices.append((self.unit_price_incl_tax, self.unit_price_excl_tax,
+                           self.quantity))
         else:
             # Need to split the discount among the affected quantity
             # of products.
-            item_incl_tax_discount = self._discount / int(self._affected_quantity)
+            item_incl_tax_discount = (
+                self._discount / int(self._affected_quantity))
             item_excl_tax_discount = item_incl_tax_discount * self._tax_ratio
             prices.append((self.unit_price_incl_tax - item_incl_tax_discount,
                            self.unit_price_excl_tax - item_excl_tax_discount,
                            self._affected_quantity))
             if self.quantity_without_discount:
-                prices.append((self.unit_price_incl_tax, self.unit_price_excl_tax, self.quantity_without_discount))
+                prices.append((self.unit_price_incl_tax,
+                               self.unit_price_excl_tax,
+                               self.quantity_without_discount))
         return prices
 
     # =======
@@ -594,14 +622,16 @@ class AbstractLine(models.Model):
 
         current_price_incl_tax = self.product.stockrecord.price_incl_tax
         if current_price_incl_tax > self.price_incl_tax:
-            msg = u"The price of '%(product)s' has increased from %(old_price)s " \
-                  u"to %(new_price)s since you added it to your basket"
+            msg = (
+                u"The price of '%(product)s' has increased from %(old_price)s "
+                u"to %(new_price)s since you added it to your basket")
             return _(msg) % {'product': self.product.get_title(),
                              'old_price': currency(self.price_incl_tax),
                              'new_price': currency(current_price_incl_tax)}
         if current_price_incl_tax < self.price_incl_tax:
-            msg = u"The price of '%(product)s' has decreased from %(old_price)s " \
-                  u"to %(new_price)s since you added it to your basket"
+            msg = (
+                u"The price of '%(product)s' has decreased from %(old_price)s "
+                u"to %(new_price)s since you added it to your basket")
             return _(msg) % {'product': self.product.get_title(),
                              'old_price': currency(self.price_incl_tax),
                              'new_price': currency(current_price_incl_tax)}
@@ -611,7 +641,8 @@ class AbstractLineAttribute(models.Model):
     """
     An attribute of a basket line
     """
-    line = models.ForeignKey('basket.Line', related_name='attributes', verbose_name=_("Line"))
+    line = models.ForeignKey('basket.Line', related_name='attributes',
+                             verbose_name=_("Line"))
     option = models.ForeignKey('catalogue.Option', verbose_name=_("Option"))
     value = models.CharField(_("Value"), max_length=255)
 

oscar/apps/basket/app.py

@@ -18,11 +18,14 @@ class BasketApplication(Application):
         urlpatterns = patterns('',
             url(r'^$', self.summary_view.as_view(), name='summary'),
             url(r'^add/$', self.add_view.as_view(), name='add'),
-            url(r'^vouchers/add/$', self.add_voucher_view.as_view(), name='vouchers-add'),
-            url(r'^vouchers/(?P<pk>\d+)/remove/$', self.remove_voucher_view.as_view(), name='vouchers-remove'),
-            url(r'^saved/$', login_required(self.saved_view.as_view()), name='saved'),
+            url(r'^vouchers/add/$', self.add_voucher_view.as_view(),
+                name='vouchers-add'),
+            url(r'^vouchers/(?P<pk>\d+)/remove/$',
+                self.remove_voucher_view.as_view(), name='vouchers-remove'),
+            url(r'^saved/$', login_required(self.saved_view.as_view()),
+                name='saved'),
         )
         return self.post_process_urls(urlpatterns)
 
 
-application = BasketApplication()
+application = BasketApplication()

oscar/apps/basket/forms.py

@@ -12,7 +12,8 @@ Product = get_model('catalogue', 'product')
 
 
 class BasketLineForm(forms.ModelForm):
-    save_for_later = forms.BooleanField(initial=False, required=False, label=_('Save for Later'))
+    save_for_later = forms.BooleanField(initial=False, required=False,
+                                        label=_('Save for Later'))
 
     def clean_quantity(self):
         qty = self.cleaned_data['quantity']
@@ -21,8 +22,8 @@ class BasketLineForm(forms.ModelForm):
         return qty
 
     def check_max_allowed_quantity(self, qty):
-        is_quantity_allowed, reason = self.instance.basket.is_quantity_allowed(qty)
-        if not is_quantity_allowed:
+        is_allowed, reason = self.instance.basket.is_quantity_allowed(qty)
+        if not is_allowed:
             raise forms.ValidationError(reason)
 
     def check_permission(self, qty):
@@ -34,15 +35,18 @@ class BasketLineForm(forms.ModelForm):
 
     class Meta:
         model = Line
-        exclude = ('basket', 'product', 'line_reference', 'price_excl_tax', 'price_incl_tax')
+        exclude = ('basket', 'product', 'line_reference',
+                   'price_excl_tax', 'price_incl_tax')
 
 
 class SavedLineForm(forms.ModelForm):
-    move_to_basket = forms.BooleanField(initial=False, required=False, label=_('Move to Basket'))
+    move_to_basket = forms.BooleanField(initial=False, required=False,
+                                        label=_('Move to Basket'))
 
     class Meta:
         model = Line
-        exclude = ('basket', 'product', 'line_reference', 'quantity', 'price_excl_tax', 'price_incl_tax')
+        exclude = ('basket', 'product', 'line_reference', 'quantity',
+                   'price_excl_tax', 'price_incl_tax')
 
     def __init__(self, user, basket, *args, **kwargs):
         self.user = user
@@ -58,8 +62,8 @@ class SavedLineForm(forms.ModelForm):
         else:
             desired_qty = self.instance.quantity + line.quantity
 
-        is_available, reason = self.instance.product.is_purchase_permitted(user=self.user,
-                                                                           quantity=desired_qty)
+        is_available, reason = self.instance.product.is_purchase_permitted(
+            user=self.user, quantity=desired_qty)
         if not is_available:
             raise forms.ValidationError(reason)
         return cleaned_data
@@ -73,8 +77,8 @@ class BaseSavedLineFormSet(BaseModelFormSet):
         super(BaseSavedLineFormSet, self).__init__(*args, **kwargs)
 
     def _construct_form(self, i, **kwargs):
-        return super(BaseSavedLineFormSet, self)._construct_form(i, user=self.user,
-                                                             basket=self.basket, **kwargs)
+        return super(BaseSavedLineFormSet, self)._construct_form(
+            i, user=self.user, basket=self.basket, **kwargs)
 
 
 SavedLineFormSet = modelformset_factory(Line, form=SavedLineForm,
@@ -86,7 +90,7 @@ class BasketVoucherForm(forms.Form):
     code = forms.CharField(max_length=128, label=_('Code'))
 
     def __init__(self, *args, **kwargs):
-        return super(BasketVoucherForm, self).__init__(*args,**kwargs)
+        return super(BasketVoucherForm, self).__init__(*args, **kwargs)
 
     def clean_code(self):
         return self.cleaned_data['code'].strip().upper()
@@ -101,7 +105,8 @@ class ProductSelectionForm(forms.Form):
         try:
             return Product.objects.get(pk=id)
         except Product.DoesNotExist:
-            raise forms.ValidationError(_("This product is not available for purchase"))
+            raise forms.ValidationError(
+                _("This product is not available for purchase"))
 
 
 class AddToBasketForm(forms.Form):
@@ -137,8 +142,8 @@ class AddToBasketForm(forms.Form):
         else:
             desired_qty = qty + line.quantity
 
-        is_available, reason = product.is_purchase_permitted(user=self.user,
-                                                             quantity=desired_qty)
+        is_available, reason = product.is_purchase_permitted(
+            user=self.user, quantity=desired_qty)
         if not is_available:
             raise forms.ValidationError(reason)
         return self.cleaned_data
@@ -152,8 +157,8 @@ class AddToBasketForm(forms.Form):
             if qty > max_allowed:
                 raise forms.ValidationError(
                     _("Due to technical limitations we are not able to ship"
-                      " more than %(threshold)d items in one order. Your basket"
-                      " currently has %(basket)d items.") % {
+                      " more than %(threshold)d items in one order. Your"
+                      " basket currently has %(basket)d items.") % {
                             'threshold': basket_threshold,
                             'basket': total_basket_quantity,
                     })
@@ -170,26 +175,28 @@ class AddToBasketForm(forms.Form):
                 attr_summary = variant.attribute_summary()
                 if attr_summary:
                     attr_summary = "(%s)" % attr_summary
-                summary = u"%s %s - %s" % (variant.get_title(), attr_summary,
-                                           currency(variant.stockrecord.price_incl_tax))
+                summary = u"%s %s - %s" % (
+                    variant.get_title(), attr_summary,
+                    currency(variant.stockrecord.price_incl_tax))
                 choices.append((variant.id, summary))
         self.fields['product_id'] = forms.ChoiceField(choices=tuple(choices),
                                                       label=_("Variant"))
 
     def _create_product_fields(self, item):
-        u"""Add the product option fields."""
+        """Add the product option fields."""
         for option in item.options:
             self._add_option_field(item, option)
 
     def _add_option_field(self, item, option):
-        u"""
+        """
         Creates the appropriate form field for the product option.
 
-        This is designed to be overridden so that specific widgets can be used for
-        certain types of options.
+        This is designed to be overridden so that specific widgets can be used
+        for certain types of options.
         """
         self.fields[option.code] = forms.CharField()
 
 
 class SimpleAddToBasketForm(AddToBasketForm):
-    quantity = forms.IntegerField(initial=1, min_value=1, widget=forms.HiddenInput, label=_('Quantity'))
+    quantity = forms.IntegerField(
+        initial=1, min_value=1, widget=forms.HiddenInput, label=_('Quantity'))

oscar/apps/basket/managers.py

@@ -2,25 +2,29 @@ from django.db import models
 
 
 class OpenBasketManager(models.Manager):
-    u"""For searching/creating OPEN baskets only."""
+    """For searching/creating OPEN baskets only."""
     status_filter = "Open"
 
     def get_query_set(self):
-        return super(OpenBasketManager, self).get_query_set().filter(status=self.status_filter)
+        return super(OpenBasketManager, self).get_query_set().filter(
+            status=self.status_filter)
 
     def get_or_create(self, **kwargs):
-        return self.get_query_set().get_or_create(status=self.status_filter, **kwargs)
+        return self.get_query_set().get_or_create(
+            status=self.status_filter, **kwargs)
 
 
 class SavedBasketManager(models.Manager):
-    u"""For searching/creating SAVED baskets only."""
+    """For searching/creating SAVED baskets only."""
     status_filter = "Saved"
 
     def get_query_set(self):
-        return super(SavedBasketManager, self).get_query_set().filter(status=self.status_filter)
+        return super(SavedBasketManager, self).get_query_set().filter(
+            status=self.status_filter)
 
     def create(self, **kwargs):
         return self.get_query_set().create(status=self.status_filter, **kwargs)
 
     def get_or_create(self, **kwargs):
-        return self.get_query_set().get_or_create(status=self.status_filter, **kwargs)
+        return self.get_query_set().get_or_create(
+            status=self.status_filter, **kwargs)

oscar/apps/basket/middleware.py

@@ -20,8 +20,8 @@ class BasketMiddleware(object):
 
     def get_basket(self, request):
         manager = Basket.open
-        cookie_basket = self.get_cookie_basket(settings.OSCAR_BASKET_COOKIE_OPEN,
-                                               request, manager)
+        cookie_basket = self.get_cookie_basket(
+            settings.OSCAR_BASKET_COOKIE_OPEN, request, manager)
 
         if hasattr(request, 'user') and request.user.is_authenticated():
             # Signed-in user: if they have a cookie basket too, it means
@@ -39,7 +39,8 @@ class BasketMiddleware(object):
 
             if cookie_basket:
                 self.merge_baskets(basket, cookie_basket)
-                request.cookies_to_delete.append(settings.OSCAR_BASKET_COOKIE_OPEN)
+                request.cookies_to_delete.append(
+                    settings.OSCAR_BASKET_COOKIE_OPEN)
         elif cookie_basket:
             # Anonymous user with a basket tied to the cookie
             basket = cookie_basket
@@ -68,7 +69,8 @@ class BasketMiddleware(object):
         if hasattr(request, 'basket') and request.basket.id > 0 \
             and not request.user.is_authenticated() \
             and settings.OSCAR_BASKET_COOKIE_OPEN not in request.COOKIES:
-            cookie = "%s_%s" % (request.basket.id, self.get_basket_hash(request.basket.id))
+            cookie = "%s_%s" % (
+                request.basket.id, self.get_basket_hash(request.basket.id))
             response.set_cookie(settings.OSCAR_BASKET_COOKIE_OPEN,
                                 cookie,
                                 max_age=settings.OSCAR_BASKET_COOKIE_LIFETIME,
@@ -110,4 +112,4 @@ class BasketMiddleware(object):
             Applicator().apply(request, basket)
 
     def get_basket_hash(self, basket_id):
-        return str(zlib.crc32(str(basket_id)+settings.SECRET_KEY))
+        return str(zlib.crc32(str(basket_id) + settings.SECRET_KEY))

oscar/apps/basket/models.py

@@ -1,5 +1,6 @@
-from oscar.apps.basket.abstract_models import (AbstractBasket, AbstractLine, AbstractLineAttribute,
-                                               OPEN, MERGED, SAVED, SUBMITTED)
+from oscar.apps.basket.abstract_models import (
+    AbstractBasket, AbstractLine, AbstractLineAttribute,
+    OPEN, MERGED, SAVED, SUBMITTED)
 
 
 class InvalidBasketLineError(Exception):
@@ -9,10 +10,10 @@ class InvalidBasketLineError(Exception):
 class Basket(AbstractBasket):
     pass
 
-    
+
 class Line(AbstractLine):
     pass
 
 
 class LineAttribute(AbstractLineAttribute):
-    pass
+    pass

oscar/apps/basket/reports.py

@@ -5,8 +5,10 @@ from django.utils.translation import gettext_lazy as _
 from oscar.core.loading import get_class, get_classes
 
 ReportGenerator = get_class('dashboard.reports.reports', 'ReportGenerator')
-ReportCSVFormatter = get_class('dashboard.reports.reports', 'ReportCSVFormatter')
-ReportHTMLFormatter = get_class('dashboard.reports.reports', 'ReportHTMLFormatter')
+ReportCSVFormatter = get_class('dashboard.reports.reports',
+                               'ReportCSVFormatter')
+ReportHTMLFormatter = get_class('dashboard.reports.reports',
+                                'ReportHTMLFormatter')
 Basket = get_model('basket', 'Basket')
 OPEN, SUBMITTED = get_classes('basket.models', ['OPEN', 'SUBMITTED'])
 
@@ -30,19 +32,23 @@ class OpenBasketReportCSVFormatter(ReportCSVFormatter):
 
         for basket in baskets:
             if basket.owner:
-                row = [basket.owner_id, basket.owner.get_full_name(), basket.owner.email,
+                row = [basket.owner_id, basket.owner.get_full_name(),
+                       basket.owner.email,
                        basket.status, basket.num_lines,
                        basket.num_items, basket.total_incl_tax,
                        self.format_datetime(basket.date_created),
                        basket.time_since_creation]
             else:
-                row = [basket.owner_id, None, None, basket.status, basket.num_lines,
-                       basket.num_items, basket.total_incl_tax,
-                       self.format_datetime(basket.date_created), basket.time_since_creation]
+                row = [basket.owner_id, None, None, basket.status,
+                       basket.num_lines, basket.num_items,
+                       basket.total_incl_tax,
+                       self.format_datetime(basket.date_created),
+                       basket.time_since_creation]
             writer.writerow(row)
 
     def filename(self, **kwargs):
-        return self.filename_template % (kwargs['start_date'], kwargs['end_date'])
+        return self.filename_template % (kwargs['start_date'],
+                                         kwargs['end_date'])
 
 
 class OpenBasketReportHTMLFormatter(ReportHTMLFormatter):
@@ -58,14 +64,12 @@ class OpenBasketReportGenerator(ReportGenerator):
 
     formatters = {
         'CSV_formatter': OpenBasketReportCSVFormatter,
-        'HTML_formatter': OpenBasketReportHTMLFormatter
-    }
+        'HTML_formatter': OpenBasketReportHTMLFormatter}
 
     def generate(self):
         additional_data = {
             'start_date': self.start_date,
-            'end_date': self.end_date
-        }
+            'end_date': self.end_date}
         baskets = Basket._default_manager.filter(status=OPEN)
         return self.formatter.generate_response(baskets, **additional_data)
 
@@ -98,7 +102,8 @@ class SubmittedBasketReportCSVFormatter(ReportCSVFormatter):
             writer.writerow(row)
 
     def filename(self, **kwargs):
-        return self.filename_template % (kwargs['start_date'], kwargs['end_date'])
+        return self.filename_template % (kwargs['start_date'],
+                                         kwargs['end_date'])
 
 
 class SubmittedBasketReportHTMLFormatter(ReportHTMLFormatter):
@@ -114,13 +119,11 @@ class SubmittedBasketReportGenerator(ReportGenerator):
 
     formatters = {
         'CSV_formatter': SubmittedBasketReportCSVFormatter,
-        'HTML_formatter': SubmittedBasketReportHTMLFormatter
-    }
+        'HTML_formatter': SubmittedBasketReportHTMLFormatter}
 
     def generate(self):
         additional_data = {
             'start_date': self.start_date,
-            'end_date': self.end_date
-        }
+            'end_date': self.end_date}
         baskets = Basket._default_manager.filter(status=SUBMITTED)
         return self.formatter.generate_response(baskets, **additional_data)