More pylint fixes

Makefile

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

oscar/apps/basket/views.py

@@ -30,7 +30,8 @@ class BasketView(ModelFormSetView):
         return self.request.basket.all_lines()
 
     def get_default_shipping_method(self, basket):
-        return Repository().get_default_shipping_method(self.request.user, self.request.basket)
+        return Repository().get_default_shipping_method(
+            self.request.user, self.request.basket)
 
     def get_basket_warnings(self, basket):
         """
@@ -61,18 +62,24 @@ class BasketView(ModelFormSetView):
         method = self.get_default_shipping_method(self.request.basket)
         context['shipping_method'] = method
         context['shipping_charge_incl_tax'] = method.basket_charge_incl_tax()
-        context['order_total_incl_tax'] = self.request.basket.total_incl_tax + method.basket_charge_incl_tax()
-        context['basket_warnings'] = self.get_basket_warnings(self.request.basket)
-        context['upsell_messages'] = self.get_upsell_messages(self.request.basket)
+        context['order_total_incl_tax'] = (
+            self.request.basket.total_incl_tax +
+            method.basket_charge_incl_tax())
+        context['basket_warnings'] = self.get_basket_warnings(
+            self.request.basket)
+        context['upsell_messages'] = self.get_upsell_messages(
+            self.request.basket)
 
         if self.request.user.is_authenticated():
             try:
-                saved_basket = self.basket_model.saved.get(owner=self.request.user)
+                saved_basket = self.basket_model.saved.get(
+                    owner=self.request.user)
             except self.basket_model.DoesNotExist:
                 pass
             else:
                 if not saved_basket.is_empty:
-                    saved_queryset = saved_basket.all_lines().select_related('product', 'product__stockrecord')
+                    saved_queryset = saved_basket.all_lines().select_related(
+                        'product', 'product__stockrecord')
                     formset = SavedLineFormSet(user=self.request.user,
                                                basket=self.request.basket,
                                                queryset=saved_queryset,
@@ -87,14 +94,20 @@ class BasketView(ModelFormSetView):
     def formset_valid(self, formset):
         save_for_later = False
         for form in formset:
-            if hasattr(form, 'cleaned_data') and form.cleaned_data['save_for_later']:
+            if (hasattr(form, 'cleaned_data') and
+                form.cleaned_data['save_for_later']):
                 line = form.instance
                 if self.request.user.is_authenticated():
                     self.move_line_to_saved_basket(line)
-                    messages.info(self.request, _(u"'%(title)s' has been saved for later") % {'title': line.product})
+                    messages.info(
+                        self.request,
+                        _(u"'%(title)s' has been saved for later") % {
+                            'title': line.product})
                     save_for_later = True
                 else:
-                    messages.error(self.request, _("You can't save an item for later if you're not logged in!"))
+                    messages.error(
+                        self.request,
+                        _("You can't save an item for later if you're not logged in!"))
                     return HttpResponseRedirect(self.get_success_url())
 
         if save_for_later:
@@ -103,14 +116,17 @@ class BasketView(ModelFormSetView):
         return super(BasketView, self).formset_valid(formset)
 
     def move_line_to_saved_basket(self, line):
-        saved_basket, _ = get_model('basket', 'basket').saved.get_or_create(owner=self.request.user)
+        saved_basket, _ = get_model('basket', 'basket').saved.get_or_create(
+            owner=self.request.user)
         saved_basket.merge_line(line)
 
     def formset_invalid(self, formset):
         errors = []
         for error_dict in formset.errors:
-            errors += [error_list.as_text() for error_list in error_dict.values()]
-        msg = _("Your basket couldn't be updated because:\n%s") % "\n".join(errors)
+            errors += [error_list.as_text()
+                       for error_list in error_dict.values()]
+        msg = _("Your basket couldn't be updated because:\n%s") % (
+            "\n".join(errors),)
         messages.warning(self.request, msg)
         return super(BasketView, self).formset_invalid(formset)
 
@@ -160,12 +176,16 @@ class BasketAddView(FormView):
         options = []
         for option in form.instance.options:
             if option.code in form.cleaned_data:
-                options.append({'option': option, 'value': form.cleaned_data[option.code]})
-        self.request.basket.add_product(form.instance, form.cleaned_data['quantity'], options)
+                options.append({
+                    'option': option,
+                    'value': form.cleaned_data[option.code]})
+        self.request.basket.add_product(
+            form.instance, form.cleaned_data['quantity'], options)
         messages.success(self.request, self.get_success_message(form))
 
         # Send signal for basket addition
-        self.add_signal.send(sender=self, product=form.instance, user=self.request.user)
+        self.add_signal.send(
+            sender=self, product=form.instance, user=self.request.user)
 
         return super(BasketAddView, self).form_valid(form)
 
@@ -173,17 +193,20 @@ class BasketAddView(FormView):
         qty = form.cleaned_data['quantity']
         title = form.instance.get_title()
         if qty == 1:
-            return _("'%(title)s' has been added to your basket") % {'title': title}
+            return _("'%(title)s' has been added to your basket") % {
+                'title': title}
         else:
-            return _("'%(title)s' (quantity %(quantity)d) has been added to your"
-                     "basket") % {'title': title, 'quantity': qty}
+            return _(
+                "'%(title)s' (quantity %(quantity)d) has been added to your"
+                "basket") % {'title': title, 'quantity': qty}
 
     def form_invalid(self, form):
         msgs = []
         for error in form.errors.values():
             msgs.append(error.as_text())
         messages.error(self.request, ",".join(msgs))
-        return HttpResponseRedirect(self.request.META.get('HTTP_REFERER',reverse('basket:summary')))
+        return HttpResponseRedirect(
+            self.request.META.get('HTTP_REFERER', reverse('basket:summary')))
 
 
 class VoucherAddView(FormView):
@@ -196,7 +219,10 @@ class VoucherAddView(FormView):
 
     def apply_voucher_to_basket(self, voucher):
         if not voucher.is_active():
-            messages.error(self.request, _("The '%(code)s' voucher has expired") % {'code': voucher.code})
+            messages.error(
+                self.request,
+                _("The '%(code)s' voucher has expired") % {
+                    'code': voucher.code})
             return
 
         is_available, message = voucher.is_available_to_user(self.request.user)
@@ -223,29 +249,43 @@ class VoucherAddView(FormView):
                 found_discount = True
                 break
         if not found_discount:
-            messages.warning(self.request, _("Your basket does not qualify for a voucher discount"))
+            messages.warning(
+                self.request,
+                _("Your basket does not qualify for a voucher discount"))
             self.request.basket.vouchers.remove(voucher)
         else:
-            messages.info(self.request, _("Voucher '%(code)s' added to basket") % {'code': voucher.code})
+            messages.info(
+                self.request,
+                _("Voucher '%(code)s' added to basket") % {
+                    'code': voucher.code})
 
     def form_valid(self, form):
         code = form.cleaned_data['code']
         if not self.request.basket.id:
-            return HttpResponseRedirect(self.request.META.get('HTTP_REFERER', reverse('basket:summary')))
+            return HttpResponseRedirect(
+                self.request.META.get('HTTP_REFERER',
+                                      reverse('basket:summary')))
         if self.request.basket.contains_voucher(code):
-            messages.error(self.request, _("You have already added the '%(code)s' voucher to your basket") % {'code': code})
+            messages.error(
+                self.request,
+                _("You have already added the '%(code)s' voucher to "
+                  "your basket") % {'code': code})
         else:
             try:
                 voucher = self.voucher_model._default_manager.get(code=code)
             except self.voucher_model.DoesNotExist:
-                messages.error(self.request, _("No voucher found with code '%(code)s'") % {'code': code})
+                messages.error(
+                    self.request,
+                    _("No voucher found with code '%(code)s'") % {
+                        'code': code})
             else:
                 self.apply_voucher_to_basket(voucher)
-        return HttpResponseRedirect(self.request.META.get('HTTP_REFERER', reverse('basket:summary')))
+        return HttpResponseRedirect(
+            self.request.META.get('HTTP_REFERER', reverse('basket:summary')))
 
     def form_invalid(self, form):
         messages.error(self.request, _("Please enter a voucher code"))
-        return HttpResponseRedirect(reverse('basket:summary')+'#voucher')
+        return HttpResponseRedirect(reverse('basket:summary') + '#voucher')
 
 
 class VoucherRemoveView(View):
@@ -263,11 +303,13 @@ class VoucherRemoveView(View):
         try:
             voucher = request.basket.vouchers.get(id=voucher_id)
         except ObjectDoesNotExist:
-            messages.error(request, _("No voucher found with id '%d'") % voucher_id)
+            messages.error(
+                request, _("No voucher found with id '%d'") % voucher_id)
         else:
             request.basket.vouchers.remove(voucher)
             request.basket.save()
-            messages.info(request, _("Voucher '%s' removed from basket") % voucher.code)
+            messages.info(
+                request, _("Voucher '%s' removed from basket") % voucher.code)
         return HttpResponseRedirect(reverse('basket:summary'))
 
 
@@ -285,7 +327,8 @@ class SavedView(ModelFormSetView):
     def get_queryset(self):
         try:
             saved_basket = self.basket_model.saved.get(owner=self.request.user)
-            return saved_basket.all_lines().select_related('product', 'product__stockrecord')
+            return saved_basket.all_lines().select_related(
+                'product', 'product__stockrecord')
         except self.basket_model.DoesNotExist:
             return []
 
@@ -304,7 +347,8 @@ class SavedView(ModelFormSetView):
         for form in formset:
             if form.cleaned_data['move_to_basket']:
                 is_move = True
-                msg = _("'%s' has been moved back to your basket") % form.instance.product
+                msg = _("'%(product)s' has been moved back to your basket") % {
+                    'product': form.instance.product}
                 messages.info(self.request, msg)
                 real_basket = self.request.basket
                 real_basket.merge_line(form.instance)
@@ -314,5 +358,10 @@ class SavedView(ModelFormSetView):
         return super(SavedView, self).formset_valid(formset)
 
     def formset_invalid(self, formset):
-        messages.error(self.request, '\n'.join(error for ed in formset.errors for el in ed.values() for error in el))
-        return HttpResponseRedirect(self.request.META.get('HTTP_REFERER', reverse('basket:summary')))
+        messages.error(
+            self.request,
+            '\n'.join(
+                error for ed in formset.errors for el
+                in ed.values() for error in el))
+        return HttpResponseRedirect(
+            self.request.META.get('HTTP_REFERER', reverse('basket:summary')))

oscar/apps/payment/models.py

@@ -9,12 +9,12 @@ from django.conf import settings
 class Transaction(models.Model):
     """
     A transaction for payment sources which need a secondary 'transaction' to actually take the money
-    
+
     This applies mainly to credit card sources which can be a pre-auth for the money.  A 'complete'
     needs to be run later to debit the money from the account.
     """
     source = models.ForeignKey('payment.Source', related_name='transactions', verbose_name=_("Source"))
-    
+
     # We define some sample types
     AUTHORISE, DEBIT, REFUND = 'Authorise', 'Debit', 'Refund'
     txn_type = models.CharField(_("Type"), max_length=128, blank=True)
@@ -22,7 +22,7 @@ class Transaction(models.Model):
     reference = models.CharField(_("Reference"), max_length=128, null=True)
     status = models.CharField(_("Status"), max_length=128, null=True)
     date_created = models.DateTimeField(_("Date Created"), auto_now_add=True)
-    
+
     def __unicode__(self):
         return _("%(type)s of %(amount).2f") % {'type': self.txn_type, 'amount': self.amount}
 
@@ -33,8 +33,8 @@ class Transaction(models.Model):
 
 class Source(models.Model):
     """
-    A source of payment for an order.  
-    
+    A source of payment for an order.
+
     This is normally a credit card which has been pre-authed for the order
     amount, but some applications will allow orders to be paid for using
     multiple sources such as cheque, credit accounts, gift cards.  Each payment
@@ -43,24 +43,24 @@ class Source(models.Model):
     order = models.ForeignKey('order.Order', related_name='sources', verbose_name=_("Order"))
     source_type = models.ForeignKey('payment.SourceType', verbose_name=_("Source Type"))
     currency = models.CharField(_("Currency"), max_length=12, default=settings.OSCAR_DEFAULT_CURRENCY)
-    
+
     # Track the various amounts associated with this source
     amount_allocated = models.DecimalField(_("Amount Allocated"), decimal_places=2, max_digits=12, default=Decimal('0.00'))
     amount_debited = models.DecimalField(_("Amount Debited"), decimal_places=2, max_digits=12, default=Decimal('0.00'))
     amount_refunded = models.DecimalField(_("Amount Refunded"), decimal_places=2, max_digits=12, default=Decimal('0.00'))
-    
+
     # Reference number for this payment source.  This is often used to look up a
-    # transaction model for a particular payment partner. 
+    # transaction model for a particular payment partner.
     reference = models.CharField(_("Reference"), max_length=128, blank=True, null=True)
-    
+
     # A customer-friendly label for the source, eg XXXX-XXXX-XXXX-1234
     label = models.CharField(_("Label"), max_length=128, blank=True, null=True)
-    
+
     # A dictionary of submission data that is stored as part of the
     # checkout process.
     submission_data = None
-    
-    # We keep a list of deferred transactions that are only actually saved when 
+
+    # We keep a list of deferred transactions that are only actually saved when
     # the source is saved for the first time
     deferred_txns = None
 
@@ -74,16 +74,16 @@ class Source(models.Model):
         if self.reference:
             description += _(" (reference: %s)") % self.reference
         return description
-    
+
     def save(self, *args, **kwargs):
         super(Source, self).save(*args, **kwargs)
         if self.deferred_txns:
             for txn in self.deferred_txns:
                 self._create_transaction(*txn)
-    
+
     def balance(self):
         return self.amount_allocated - self.amount_debited + self.amount_refunded
-    
+
     def create_deferred_transaction(self, txn_type, amount, reference=None, status=None):
         """
         Register the data for a transaction that can't be created yet due to FK
@@ -93,14 +93,14 @@ class Source(models.Model):
         if self.deferred_txns is None:
             self.deferred_txns = []
         self.deferred_txns.append((txn_type, amount, reference, status))
-    
+
     def _create_transaction(self, txn_type, amount, reference=None, status=None):
         Transaction.objects.create(source=self,
                                    txn_type=txn_type,
                                    amount=amount,
                                    reference=reference,
                                    status=status)
-    
+
     def allocate(self, amount, reference=None, status=None):
         """
         Convenience method for ring-fencing money against this source
@@ -108,7 +108,7 @@ class Source(models.Model):
         self.amount_allocated += amount
         self.save()
         self._create_transaction(Transaction.AUTHORISE, amount, reference, status)
-    
+
     def debit(self, amount=None, reference=None, status=None):
         """
         Convenience method for recording debits against this source
@@ -118,7 +118,7 @@ class Source(models.Model):
         self.amount_debited += amount
         self.save()
         self._create_transaction(Transaction.DEBIT, amount, reference, status)
-        
+
     def refund(self, amount, reference=None, status=None):
         """
         Convenience method for recording refunds against this source
@@ -126,19 +126,19 @@ class Source(models.Model):
         self.amount_refunded += amount
         self.save()
         self._create_transaction(Transaction.REFUND, amount, reference, status)
-    
+
     @property
     def amount_available_for_refund(self):
         """
         Return the amount available to be refunded
         """
         return self.amount_debited - self.amount_refunded
-    
-    
+
+
 class SourceType(models.Model):
     """
     A type of payment source.
-    
+
     This could be an external partner like PayPal or DataCash,
     or an internal source such as a managed account.i
     """
@@ -157,7 +157,7 @@ class SourceType(models.Model):
         if not self.code:
             self.code = slugify(self.name)
         super(SourceType, self).save(*args, **kwargs)
-    
+
 
 class Bankcard(models.Model):
     user = models.ForeignKey('auth.User', related_name='bankcards', verbose_name=_("User"))
@@ -165,7 +165,7 @@ class Bankcard(models.Model):
     name = models.CharField(_("Name"), max_length=255)
     number = models.CharField(_("Number"), max_length=32)
     expiry_date = models.DateField(_("Expiry Date"))
-    
+
     # For payment partners who are storing the full card details for us
     partner_reference = models.CharField(_("Partner Reference"), max_length=255, null=True, blank=True)
 
@@ -175,7 +175,7 @@ class Bankcard(models.Model):
 
     def save(self, *args, **kwargs):
         self.number = self._get_obfuscated_number()
-        super(Bankcard, self).save(*args, **kwargs)    
-        
+        super(Bankcard, self).save(*args, **kwargs)
+
     def _get_obfuscated_number(self):
         return u"XXXX-XXXX-XXXX-%s" % self.number[-4:]