Fix lint issues

Upgrading pyflakes meant the number of violations jumped above the
failure threshold.

Also added a few more warnings to the ignore list.

Author: codeinthehole

lint.sh

@@ -9,7 +9,7 @@
 THRESHOLD=795
 
 # Some warnings aren't worth worrying about...
-IGNORE="W292,E202"
+IGNORE="W292,E202,E128,E124"
 
 # Run flake8 and convert the output into a format that the "violations" plugin 
 # for Jenkins/Hudson can understand.  Ignore warnings from migrations we we don't

oscar/apps/address/abstract_models.py

@@ -173,7 +173,7 @@ class AbstractShippingAddress(AbstractAddress):
     notes = models.TextField(
         blank=True, null=True,
         verbose_name=_('Courier instructions'),
-        help_text=_("For example, leave the parcel in the wheelie bin " \
+        help_text=_("For example, leave the parcel in the wheelie bin "
                     "if I'm not in."))
 
     class Meta:

oscar/apps/basket/abstract_models.py

@@ -25,7 +25,7 @@ class AbstractBasket(models.Model):
     # - 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")
     STATUS_CHOICES = (
         (OPEN, _("Open - currently active")),
         (MERGED, _("Merged - superceded by another basket")),
@@ -677,17 +677,21 @@ def get_warning(self):
 
         current_price_incl_tax = self.product.stockrecord.price_incl_tax
         if current_price_incl_tax > self.price_incl_tax:
-            return _(
-                u"The price of '%(product)s' has increased from %(old_price)s to %(new_price)s since you added it to your basket") % {
-                    'product': self.product.get_title(),
-                    'old_price': currency(self.price_incl_tax),
-                    'new_price': currency(current_price_incl_tax)}
+            msg = ("The price of '%(product)s' has increased from "
+                   "%(old_price)s 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:
-            return _(
-                u"The price of '%(product)s' has decreased from %(old_price)s to %(new_price)s since you added it to your basket") % {
-                    'product': self.product.get_title(),
-                    'old_price': currency(self.price_incl_tax),
-                    'new_price': currency(current_price_incl_tax)}
+            msg = ("The price of '%(product)s' has decreased from "
+                   "%(old_price)s 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)}
 
 
 class AbstractLineAttribute(models.Model):

oscar/apps/basket/forms.py

@@ -83,8 +83,8 @@ def _construct_form(self, i, **kwargs):
 
 
 SavedLineFormSet = modelformset_factory(Line, form=SavedLineForm,
-                                         formset=BaseSavedLineFormSet, extra=0,
-                                         can_delete=True)
+                                        formset=BaseSavedLineFormSet, extra=0,
+                                        can_delete=True)
 
 
 class BasketVoucherForm(forms.Form):
@@ -169,9 +169,9 @@ def clean_quantity(self):
                     _("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,
-                    })
+                          'threshold': basket_threshold,
+                          'basket': total_basket_quantity,
+                      })
         return qty
 
     def _create_group_product_fields(self, item):
@@ -189,8 +189,8 @@ def _create_group_product_fields(self, item):
                         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"))
+                    self.fields['product_id'] = forms.ChoiceField(
+                        choices=tuple(choices), label=_("Variant"))
 
     def _create_product_fields(self, item):
         """

oscar/apps/basket/middleware.py

@@ -65,9 +65,9 @@ def process_response(self, request, response):
 
         # If a basket has had products added to it, but the user is anonymous
         # then we need to assign it to a cookie
-        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:
+        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))
             response.set_cookie(settings.OSCAR_BASKET_COOKIE_OPEN,

oscar/apps/basket/views.py

@@ -17,11 +17,11 @@
 from oscar.templatetags.currency_filters import currency
 from oscar.core.loading import get_class, get_classes
 Applicator = get_class('offer.utils', 'Applicator')
-BasketLineForm, AddToBasketForm, BasketVoucherForm, \
-        SavedLineFormSet, SavedLineForm, ProductSelectionForm = get_classes(
-            'basket.forms', ('BasketLineForm', 'AddToBasketForm',
-                             'BasketVoucherForm', 'SavedLineFormSet',
-                             'SavedLineForm', 'ProductSelectionForm'))
+(BasketLineForm, AddToBasketForm, BasketVoucherForm,
+ SavedLineFormSet, SavedLineForm, ProductSelectionForm) = get_classes(
+     'basket.forms', ('BasketLineForm', 'AddToBasketForm',
+                      'BasketVoucherForm', 'SavedLineFormSet',
+                      'SavedLineForm', 'ProductSelectionForm'))
 Repository = get_class('shipping.repository', ('Repository'))
 
 
@@ -162,12 +162,12 @@ def formset_valid(self, formset):
 
         for form in formset:
             if (hasattr(form, 'cleaned_data') and
-                form.cleaned_data['save_for_later']):
+                    form.cleaned_data['save_for_later']):
                 line = form.instance
                 if self.request.user.is_authenticated():
                     self.move_line_to_saved_basket(line)
                     msg = _(u"'%(title)s' has been saved for later") % {
-                            'title': line.product}
+                        'title': line.product}
                     flash_messages.info(msg)
                     save_for_later = True
                 else:

oscar/apps/catalogue/abstract_models.py

@@ -570,16 +570,16 @@ def validate_attributes(self):
             value = getattr(self, attribute.code, None)
             if value is None:
                 if attribute.required:
-                    raise ValidationError(_("%(attr)s attribute cannot " \
-                                            "be blank") % \
-                                            {'attr': attribute.code})
+                    raise ValidationError(
+                        _("%(attr)s attribute cannot be blanke") %
+                        {'attr': attribute.code})
             else:
                 try:
                     attribute.validate_value(value)
                 except ValidationError, e:
-                    raise ValidationError(_("%(attr)s attribute %(err)s") % \
-                                            {'attr': attribute.code,
-                                             'err': e})
+                    raise ValidationError(
+                        _("%(attr)s attribute %(err)s") %
+                        {'attr': attribute.code, 'err': e})
 
     def get_values(self):
         return self.product.attribute_values.all()
@@ -688,9 +688,9 @@ def _validate_option(self, value):
         valid_values = self.option_group.options.values_list('option',
                                                              flat=True)
         if value.option not in valid_values:
-            raise ValidationError(_("%(enum)s is not a valid choice "
-                                        "for %(attr)s") % \
-                                       {'enum': value, 'attr': self})
+            raise ValidationError(
+                _("%(enum)s is not a valid choice for %(attr)s") %
+                {'enum': value, 'attr': self})
 
     def get_validator(self):
         DATATYPE_VALIDATORS = {
@@ -716,11 +716,11 @@ def save_value(self, product, value):
         try:
             value_obj = product.attribute_values.get(attribute=self)
         except get_model('catalogue', 'ProductAttributeValue').DoesNotExist:
-            if value == None or value == '':
+            if value is None or value == '':
                 return
             model = get_model('catalogue', 'ProductAttributeValue')
             value_obj = model.objects.create(product=product, attribute=self)
-        if value == None or value == '':
+        if value is None or value == '':
             value_obj.delete()
             return
         if value != value_obj.value:

oscar/apps/catalogue/utils.py

@@ -21,7 +21,7 @@
 
 class Importer(object):
 
-    allowed_extensions = ['.jpeg','.jpg','.gif','.png']
+    allowed_extensions = ['.jpeg', '.jpg', '.gif', '.png']
 
     def __init__(self, logger, field):
         self.logger = logger

oscar/apps/dashboard/orders/views.py

@@ -59,8 +59,10 @@ def get_stats(self, filters):
         stats = {
             'total_orders': orders.count(),
             'total_lines': Line.objects.filter(order__in=orders).count(),
-            'total_revenue': orders.aggregate(Sum('total_incl_tax'))['total_incl_tax__sum'] or D('0.00'),
-            'order_status_breakdown': orders.order_by('status').values('status').annotate(freq=Count('id'))
+            'total_revenue': orders.aggregate(
+                Sum('total_incl_tax'))['total_incl_tax__sum'] or D('0.00'),
+            'order_status_breakdown': orders.order_by('status').values(
+                'status').annotate(freq=Count('id'))
         }
         return stats
 

oscar/defaults.py

@@ -96,7 +96,7 @@
                 'label': _('Low stock alerts'),
                 'url_name': 'dashboard:stock-alert-list',
             },
-         ]
+        ]
     },
     {
         'label': _('Fulfilment'),