Fix all flake8 issues.

lint.sh

@@ -6,7 +6,7 @@
 
 # Ideally, this figure should be < 100.  I'll keep reducing it as the 
 # codebase gets tidied up incrementally.
-THRESHOLD=795
+THRESHOLD=0
 
 # Some warnings aren't worth worrying about...
 IGNORE="W292,E202,E128,E124"

oscar/app.py

@@ -23,12 +23,13 @@ class Shop(Application):
     def get_urls(self):
         # After we drop support for Django<1.6 the following line won't be
         # necessary, and the parameter uidb36 should be replaced with uidb64.
-        # The necessary update should also be done in oscar/apps/customer/utils.py
+        # The necessary update should also be done in
+        # oscar/apps/customer/utils.py
         password_reset_confirm = getattr(
             auth_views, 'password_reset_confirm_uidb36',
             auth_views.password_reset_confirm)
 
-        urlpatterns = patterns('',
+        urls = [
             (r'^i18n/', include('django.conf.urls.i18n')),
             (r'^catalogue/', include(self.catalogue_app.urls)),
             (r'^basket/', include(self.basket_app.urls)),
@@ -49,16 +50,18 @@ class Shop(Application):
             url(r'^password-reset/done/$',
                 login_forbidden(auth_views.password_reset_done),
                 name='password-reset-done'),
-            url(r'^password-reset/confirm/(?P<uidb36>[0-9A-Za-z]{1,13})-(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
+            url(r'^password-reset/confirm/(?P<uidb36>[0-9A-Za-z]{1,13})-'
+                r'(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
                 login_forbidden(password_reset_confirm),
-                {'post_reset_redirect': reverse_lazy('password-reset-complete')},
+                {'post_reset_redirect':
+                 reverse_lazy('password-reset-complete')},
                 name='password-reset-confirm'),
             url(r'^password-reset/complete/$',
                 login_forbidden(auth_views.password_reset_complete),
                 name='password-reset-complete'),
             (r'', include(self.promotions_app.urls)),
-        )
-        return urlpatterns
+        ]
+        return patterns('', *urls)
 
 
 # 'shop' kept for legacy projects - 'application' is a better name

oscar/apps/address/abstract_models.py

@@ -268,8 +268,8 @@ class AbstractAddress(models.Model):
             country_code = self.country.iso_3166_1_a2
             regex = self.POSTCODES_REGEX.get(country_code, None)
             if regex:
-                msg = _("Addresses in %(country)s require a valid postcode") % {
-                        'country': self.country}
+                msg = _("Addresses in %(country)s require a valid postcode") \
+                    % {'country': self.country}
                 raise exceptions.ValidationError(msg)
 
         if self.postcode and self.country_id:
@@ -281,9 +281,9 @@ class AbstractAddress(models.Model):
             # Validate postcode against regext for the country if available
             if regex and not re.match(regex, postcode):
                 msg = _("The postcode '%(postcode)s' is not valid "
-                        "for %(country)s") % {
-                            'postcode': self.postcode,
-                            'country': self.country}
+                        "for %(country)s") \
+                    % {'postcode': self.postcode,
+                       'country': self.country}
                 raise exceptions.ValidationError(
                     {'postcode': msg})
 
@@ -497,15 +497,13 @@ class AbstractUserAddress(AbstractShippingAddress):
 
     def _ensure_defaults_integrity(self):
         if self.is_default_for_shipping:
-            self.__class__._default_manager.filter(
-                user=self.user,
-                is_default_for_shipping=True).update(
-                    is_default_for_shipping=False)
+            self.__class__._default_manager\
+                .filter(user=self.user, is_default_for_shipping=True)\
+                .update(is_default_for_shipping=False)
         if self.is_default_for_billing:
-            self.__class__._default_manager.filter(
-                user=self.user,
-                is_default_for_billing=True).update(
-                    is_default_for_billing=False)
+            self.__class__._default_manager\
+                .filter(user=self.user, is_default_for_billing=True)\
+                .update(is_default_for_billing=False)
 
     class Meta:
         abstract = True
@@ -523,7 +521,8 @@ class AbstractUserAddress(AbstractShippingAddress):
             qs = qs.exclude(id=self.id)
         if qs.exists():
             raise exceptions.ValidationError({
-                '__all__': [_("This address is already in your address book")]})
+                '__all__': [_("This address is already in your address"
+                              " book")]})
 
 
 class AbstractBillingAddress(AbstractAddress):

oscar/apps/analytics/models.py

@@ -20,4 +20,4 @@ class UserSearch(AbstractUserSearch):
 
 
 # Import receiver functions
-from oscar.apps.analytics.receivers import *
+from oscar.apps.analytics.receivers import *  # noqa

oscar/apps/basket/abstract_models.py

@@ -75,10 +75,10 @@ class AbstractBasket(models.Model):
 
     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}
+            u"%(status)s basket (owner: %(owner)s, lines: %(num_lines)d)") \
+            % {'status': self.status,
+               'owner': self.owner,
+               'num_lines': self.num_lines}
 
     # ========
     # Strategy
@@ -142,9 +142,8 @@ class AbstractBasket(models.Model):
             if qty > max_allowed:
                 return False, _(
                     "Due to technical limitations we are not able "
-                    "to ship more than %(threshold)d items in one order.") % {
-                        'threshold': basket_threshold,
-                    }
+                    "to ship more than %(threshold)d items in one order.") \
+                    % {'threshold': basket_threshold}
         return True, None
 
     # ============
@@ -182,8 +181,8 @@ class AbstractBasket(models.Model):
         if price_currency and stock_info.price.currency != price_currency:
             raise ValueError((
                 "Basket lines must all have the same currency. Proposed "
-                "line has currency %s, while basket has currency %s") % (
-                    stock_info.price.currency, price_currency))
+                "line has currency %s, while basket has currency %s")
+                % (stock_info.price.currency, price_currency))
 
         if stock_info.stockrecord is None:
             raise ValueError((
@@ -594,10 +593,10 @@ class AbstractLine(models.Model):
 
     def __unicode__(self):
         return _(
-            u"Basket #%(basket_id)d, Product #%(product_id)d, quantity %(quantity)d") % {
-                'basket_id': self.basket.pk,
-                'product_id': self.product.pk,
-                'quantity': self.quantity}
+            u"Basket #%(basket_id)d, Product #%(product_id)d, quantity"
+            u" %(quantity)d") % {'basket_id': self.basket.pk,
+                                 'product_id': self.product.pk,
+                                 'quantity': self.quantity}
 
     def save(self, *args, **kwargs):
         """
@@ -762,7 +761,8 @@ class AbstractLine(models.Model):
             # against tax inclusive prices but we need to guess how much of the
             # discount applies to tax-exclusive prices.  We do this by
             # assuming a linear tax and scaling down the original discount.
-            return self.line_price_excl_tax - self._tax_ratio * self._discount_incl_tax
+            return self.line_price_excl_tax \
+                - self._tax_ratio * self._discount_incl_tax
         return self.line_price_excl_tax
 
     @property
@@ -814,15 +814,15 @@ class AbstractLine(models.Model):
                 'new_price': currency(current_price_incl_tax)
             }
             if current_price_incl_tax > self.price_incl_tax:
-                warning = _("The price of '%(product)s' has increased from "
-                            "%(old_price)s to %(new_price)s since you added it "
-                            "to your basket")
+                warning = _("The price of '%(product)s' has increased from"
+                            " %(old_price)s to %(new_price)s since you added"
+                            " it to your basket")
                 return warning % product_prices
             else:
-                warning = _("The price of '%(product)s' has decreased from "
-                            "%(old_price)s to %(new_price)s since you added it "
-                            "to your basket")
-                return warning %  product_prices
+                warning = _("The price of '%(product)s' has decreased from"
+                            " %(old_price)s to %(new_price)s since you added"
+                            " it to your basket")
+                return warning % product_prices
 
 
 class AbstractLineAttribute(models.Model):

oscar/apps/basket/app.py

@@ -14,7 +14,7 @@ class BasketApplication(Application):
     remove_voucher_view = views.VoucherRemoveView
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             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(),
@@ -23,8 +23,8 @@ class BasketApplication(Application):
                 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)
+        ]
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = BasketApplication()

oscar/apps/basket/forms.py

@@ -31,8 +31,9 @@ class BasketLineForm(forms.ModelForm):
             raise forms.ValidationError(reason)
 
     def check_permission(self, qty):
-        is_available, reason = self.instance.stockinfo.availability.is_purchase_permitted(
-            quantity=qty)
+        is_available, reason \
+            = self.instance.stockinfo.availability.is_purchase_permitted(
+                quantity=qty)
         if not is_available:
             raise forms.ValidationError(reason)
 
@@ -191,10 +192,9 @@ class AddToBasketForm(forms.Form):
                 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.") % {
-                          'threshold': basket_threshold,
-                          'basket': total_basket_quantity,
-                      })
+                      " basket currently has %(basket)d items.")
+                    % {'threshold': basket_threshold,
+                       'basket': total_basket_quantity})
         return qty
 
     def _create_group_product_fields(self, item):

oscar/apps/basket/reports.py

@@ -23,7 +23,7 @@ class OpenBasketReportCSVFormatter(ReportCSVFormatter):
                       _('Num items'),
                       _('Date of creation'),
                       _('Time since creation'),
-                     ]
+                      ]
         writer.writerow(header_row)
 
         for basket in baskets:
@@ -80,7 +80,7 @@ class SubmittedBasketReportCSVFormatter(ReportCSVFormatter):
                       _('Num items'),
                       _('Date created'),
                       _('Time between creation and submission'),
-                     ]
+                      ]
         writer.writerow(header_row)
 
         for basket in baskets:
@@ -99,7 +99,8 @@ class SubmittedBasketReportCSVFormatter(ReportCSVFormatter):
 
 
 class SubmittedBasketReportHTMLFormatter(ReportHTMLFormatter):
-    filename_template = 'dashboard/reports/partials/submitted_basket_report.html'
+    filename_template = 'dashboard/reports/partials/' \
+        'submitted_basket_report.html'
 
 
 class SubmittedBasketReportGenerator(ReportGenerator):

oscar/apps/basket/signals.py

@@ -1,4 +1,4 @@
 import django.dispatch
 
 basket_addition = django.dispatch.Signal(providing_args=["product", "user"])
-voucher_addition = django.dispatch.Signal(providing_args=["basket", "voucher"])
+voucher_addition = django.dispatch.Signal(providing_args=["basket", "voucher"])

oscar/apps/basket/views.py

@@ -17,10 +17,11 @@ from oscar.apps.basket.signals import basket_addition, voucher_addition
 from oscar.core.loading import get_class, get_classes
 Applicator = get_class('offer.utils', 'Applicator')
 (BasketLineFormSet, BasketLineForm, AddToBasketForm, BasketVoucherForm,
- SavedLineFormSet, SavedLineForm, ProductSelectionForm) = get_classes(
-     'basket.forms', ('BasketLineFormSet', 'BasketLineForm', 'AddToBasketForm',
-                      'BasketVoucherForm', 'SavedLineFormSet',
-                      'SavedLineForm', 'ProductSelectionForm'))
+ SavedLineFormSet, SavedLineForm, ProductSelectionForm) \
+    = get_classes('basket.forms', ('BasketLineFormSet', 'BasketLineForm',
+                                   'AddToBasketForm', 'BasketVoucherForm',
+                                   'SavedLineFormSet', 'SavedLineForm',
+                                   'ProductSelectionForm'))
 Repository = get_class('shipping.repository', ('Repository'))
 OrderTotalCalculator = get_class(
     'checkout.calculators', 'OrderTotalCalculator')
@@ -124,7 +125,8 @@ class BasketView(ModelFormSetView):
         applied_offers = basket.offer_applications.offers.values()
         msgs = []
         for offer in offers:
-            if offer.is_condition_partially_satisfied(basket) and offer not in applied_offers:
+            if offer.is_condition_partially_satisfied(basket) \
+                    and offer not in applied_offers:
                 data = {
                     'message': offer.get_upsell_message(basket),
                     'offer': offer}

oscar/apps/catalogue/abstract_models.py

@@ -133,7 +133,7 @@ class AbstractCategory(MP_Node):
         Moves the current node and all its descendants to a new position
         relative to another node.
 
-        See https://tabo.pe/projects/django-treebeard/docs/1.61/api.html#treebeard.models.Node.move
+        See https://tabo.pe/projects/django-treebeard/docs/1.61/api.html#treebeard.models.Node.move  # noqa
         """
         super(AbstractCategory, self).move(target, pos)
 
@@ -1066,9 +1066,10 @@ class AbstractProductImage(models.Model):
         _("Caption"), max_length=200, blank=True, null=True)
 
     #: Use display_order to determine which is the "primary" image
-    display_order = models.PositiveIntegerField(_("Display Order"), default=0,
-        help_text=_("""An image with a display order of
-                       zero will be the primary image for a product"""))
+    display_order = models.PositiveIntegerField(
+        _("Display Order"), default=0,
+        help_text=_("An image with a display order of zero will be the primary"
+                    " image for a product"))
     date_created = models.DateTimeField(_("Date Created"), auto_now_add=True)
 
     class Meta:
@@ -1086,4 +1087,3 @@ class AbstractProductImage(models.Model):
         Return bool if image display order is 0
         """
         return self.display_order == 0
-

oscar/apps/catalogue/app.py

@@ -15,7 +15,7 @@ class BaseCatalogueApplication(Application):
 
     def get_urls(self):
         urlpatterns = super(BaseCatalogueApplication, self).get_urls()
-        urlpatterns += patterns('',
+        urls = [
             url(r'^$', self.index_view.as_view(), name='index'),
             url(r'^(?P<product_slug>[\w-]*)_(?P<pk>\d+)/$',
                 self.detail_view.as_view(), name='detail'),
@@ -25,7 +25,8 @@ class BaseCatalogueApplication(Application):
                 self.range_view.as_view(), name='range'),
             # Legacy route for the category view
             url(r'^(?P<category_slug>[\w-]+(/[\w-]+)*)/$',
-                self.category_view.as_view(), name='category'))
+                self.category_view.as_view(), name='category')]
+        urlpatterns += patterns('', *urls)
         return self.post_process_urls(urlpatterns)
 
 
@@ -35,10 +36,11 @@ class ReviewsApplication(Application):
 
     def get_urls(self):
         urlpatterns = super(ReviewsApplication, self).get_urls()
-        urlpatterns += patterns('',
+        urls = [
             url(r'^(?P<product_slug>[\w-]*)_(?P<product_pk>\d+)/reviews/',
                 include(self.reviews_app.urls)),
-        )
+        ]
+        urlpatterns += patterns('', *urls)
         return self.post_process_urls(urlpatterns)
 
 

oscar/apps/catalogue/managers.py

@@ -7,15 +7,13 @@ class ProductManager(models.Manager):
         """
         Return ``QuerySet`` with related content pre-loaded.
         """
-        return self.get_query_set().select_related(
-            'product_class',
-            ).prefetch_related(
-            'variants',
-            'product_options',
-            'product_class__options',
-            'stockrecords',
-            'images',
-            ).all()
+        return self.get_query_set().select_related('product_class')\
+            .prefetch_related('variants',
+                              'product_options',
+                              'product_class__options',
+                              'stockrecords',
+                              'images',
+                              ).all()
 
 
 class BrowsableProductManager(ProductManager):

oscar/apps/catalogue/models.py

@@ -1,7 +1,7 @@
 """
 Vanilla product models
 """
-from oscar.apps.catalogue.abstract_models import *
+from oscar.apps.catalogue.abstract_models import *  # noqa
 
 
 class ProductClass(AbstractProductClass):
@@ -63,4 +63,4 @@ class Option(AbstractOption):
 class ProductImage(AbstractProductImage):
     pass
 
-from .receivers import *
+from .receivers import *  # noqa

oscar/apps/catalogue/reviews/abstract_models.py

@@ -45,7 +45,9 @@ class AbstractProductReview(models.Model):
         (APPROVED, _("Approved")),
         (REJECTED, _("Rejected")),
     )
-    default_status = FOR_MODERATION if settings.OSCAR_MODERATE_REVIEWS else APPROVED
+    default_status = APPROVED
+    if settings.OSCAR_MODERATE_REVIEWS:
+        default_status = FOR_MODERATION
     status = models.SmallIntegerField(
         _("Status"), choices=STATUS_CHOICES, default=default_status)
 

oscar/apps/catalogue/reviews/admin.py

@@ -4,7 +4,8 @@ from oscar.apps.catalogue.reviews.models import ProductReview, Vote
 
 
 class ProductReviewAdmin(admin.ModelAdmin):
-    list_display = ('product', 'title', 'score', 'status', 'total_votes', 'delta_votes', 'date_created')
+    list_display = ('product', 'title', 'score', 'status', 'total_votes',
+                    'delta_votes', 'date_created')
     readonly_fields = ('total_votes', 'delta_votes')
 
 

oscar/apps/catalogue/reviews/app.py

@@ -14,15 +14,15 @@ class ProductReviewsApplication(Application):
     list_view = views.ProductReviewList
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             url(r'^(?P<pk>\d+)/$', self.detail_view.as_view(),
                 name='reviews-detail'),
             url(r'^add/$', self.create_view.as_view(), name='reviews-add'),
             url(r'^(?P<pk>\d+)/vote/$', self.vote_view.as_view(),
                 name='reviews-vote'),
             url(r'^$', self.list_view.as_view(), name='reviews-list'),
-        )
-        return self.post_process_urls(urlpatterns)
+        ]
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = ProductReviewsApplication()

oscar/apps/catalogue/reviews/managers.py

@@ -3,20 +3,23 @@ from django.db import models
 
 class ApprovedReviewsManager(models.Manager):
     def get_query_set(self):
-        return super(ApprovedReviewsManager, self).get_query_set().filter(status=1)
-
+        queryset = super(ApprovedReviewsManager, self).get_query_set()
+        return queryset.filter(status=1)
 
 
 class RecentReviewsManager(models.Manager):
     def get_query_set(self):
-        return super(RecentReviewsManager, self).get_query_set().filter(approved=True).order_by('-date_created')
+        queryset = super(RecentReviewsManager, self).get_query_set()
+        return queryset.filter(approved=True).order_by('-date_created')
 
 
 class TopScoredReviewsManager(models.Manager):
     def get_query_set(self):
-        return super(TopScoredReviewsManager, self).get_query_set().filter(approved=True).order_by('-score')
+        queryset = super(TopScoredReviewsManager, self).get_query_set()
+        return queryset.filter(approved=True).order_by('-score')
 
 
 class TopVotedReviewsManager(models.Manager):
     def get_query_set(self):
-        return super(TopVotedReviewsManager, self).get_query_set().filter(approved=True).order_by('-delta_votes')
+        queryset = super(TopVotedReviewsManager, self).get_query_set()
+        return queryset.filter(approved=True).order_by('-delta_votes')

oscar/apps/catalogue/reviews/models.py

@@ -1,4 +1,5 @@
-from oscar.apps.catalogue.reviews.abstract_models import AbstractProductReview, AbstractVote
+from oscar.apps.catalogue.reviews.abstract_models import \
+    AbstractProductReview, AbstractVote
 
 
 class ProductReview(AbstractProductReview):

oscar/apps/catalogue/reviews/views.py

@@ -100,7 +100,8 @@ class ProductReviewList(ListView):
 
     def get_queryset(self):
         qs = self.model.approved.filter(product=self.kwargs['product_pk'])
-        if 'sort_by' in self.request.GET and self.request.GET['sort_by'] == 'score':
+        if 'sort_by' in self.request.GET \
+                and self.request.GET['sort_by'] == 'score':
             return qs.order_by('-score')
         return qs.order_by('-date_created')
 

oscar/apps/catalogue/utils.py

@@ -38,21 +38,29 @@ class Importer(object):
         if image_dir:
             for filename in filenames:
                 try:
-                    lookup_value = self._get_lookup_value_from_filename(filename)
+                    lookup_value \
+                        = self._get_lookup_value_from_filename(filename)
                     self._process_image(image_dir, filename, lookup_value)
                     stats['num_processed'] += 1
                 except Product.MultipleObjectsReturned:
-                    self.logger.warning("Multiple products matching %s='%s', skipping" % (self._field, lookup_value))
+                    self.logger.warning("Multiple products matching %s='%s',"
+                                        " skipping"
+                                        % (self._field, lookup_value))
                     stats['num_skipped'] += 1
                 except Product.DoesNotExist:
-                    self.logger.warning("No item matching %s='%s'" % (self._field, lookup_value))
+                    self.logger.warning("No item matching %s='%s'"
+                                        % (self._field, lookup_value))
                     stats['num_skipped'] += 1
                 except IdenticalImageError:
-                    self.logger.warning(" - Identical image already exists for %s='%s', skipping" % (self._field, lookup_value))
+                    self.logger.warning(" - Identical image already exists for"
+                                        " %s='%s', skipping"
+                                        % (self._field, lookup_value))
                     stats['num_skipped'] += 1
                 except IOError, e:
-                    raise ImageImportError(_('%(filename)s is not a valid image (%(error)s)') % {
-                        'filename': filename, 'error': e})
+                    raise ImageImportError(_('%(filename)s is not a valid'
+                                             ' image (%(error)s)')
+                                           % {'filename': filename,
+                                              'error': e})
                     stats['num_invalid'] += 1
                 except FieldError, e:
                     raise ImageImportError(e)
@@ -60,8 +68,10 @@ class Importer(object):
             if image_dir != dirname:
                 shutil.rmtree(image_dir)
         else:
-            raise InvalidImageArchive(_('%s is not a valid image archive') % dirname)
-        self.logger.info("Finished image import: %(num_processed)d imported, %(num_skipped)d skipped" % stats)
+            raise InvalidImageArchive(_('%s is not a valid image archive')
+                                      % dirname)
+        self.logger.info("Finished image import: %(num_processed)d imported,"
+                         " %(num_skipped)d skipped" % stats)
 
     def _get_image_files(self, dirname):
         filenames = []
@@ -69,7 +79,8 @@ class Importer(object):
         if image_dir:
             for filename in os.listdir(image_dir):
                 ext = os.path.splitext(filename)[1]
-                if os.path.isfile(os.path.join(image_dir, filename)) and ext in self.allowed_extensions:
+                if os.path.isfile(os.path.join(image_dir, filename)) \
+                        and ext in self.allowed_extensions:
                     filenames.append(filename)
         return image_dir, filenames
 

oscar/apps/catalogue/views.py

@@ -124,8 +124,8 @@ class ProductCategoryView(ListView):
         if 'pk' in self.kwargs:
             self.category = get_object_or_404(Category, pk=self.kwargs['pk'])
         else:
-            self.category = get_object_or_404(Category,
-                                              slug=self.kwargs['category_slug'])
+            self.category = get_object_or_404(
+                Category, slug=self.kwargs['category_slug'])
 
     def get(self, request, *args, **kwargs):
         self.get_object()
@@ -176,7 +176,8 @@ class ProductListView(ListView):
         qs = Product.browsable.base_queryset()
         if q:
             # Send signal to record the view of this product
-            self.search_signal.send(sender=self, query=q, user=self.request.user)
+            self.search_signal.send(sender=self, query=q,
+                                    user=self.request.user)
             return qs.filter(title__icontains=q)
         else:
             return qs
@@ -187,6 +188,7 @@ class ProductListView(ListView):
         if not q:
             context['summary'] = _('All products')
         else:
-            context['summary'] = _("Products matching '%(query)s'") % {'query': q}
+            context['summary'] = _("Products matching '%(query)s'") \
+                % {'query': q}
             context['search_term'] = q
         return context

oscar/apps/checkout/app.py

@@ -19,7 +19,7 @@ class CheckoutApplication(Application):
     thankyou_view = views.ThankYouView
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             url(r'^$', self.index_view.as_view(), name='index'),
 
             # Shipping/user address views
@@ -48,8 +48,8 @@ class CheckoutApplication(Application):
                 name='preview'),
             url(r'thank-you/$', self.thankyou_view.as_view(),
                 name='thank-you'),
-        )
-        return self.post_process_urls(urlpatterns)
+        ]
+        return self.post_process_urls(patterns('', *urls))
 
     def get_url_decorator(self, pattern):
         if not settings.OSCAR_ALLOW_ANON_CHECKOUT:

oscar/apps/checkout/context_processors.py

@@ -1,4 +1,7 @@
 from django.conf import settings
 
+
 def checkout(request):
-    return {'anon_checkout_allowed': getattr(settings, 'OSCAR_ALLOW_ANON_CHECKOUT', False)}
+    anon_checkout_allowed \
+        = getattr(settings, 'OSCAR_ALLOW_ANON_CHECKOUT', False)
+    return {'anon_checkout_allowed': anon_checkout_allowed}

oscar/apps/checkout/decorators.py

@@ -11,14 +11,15 @@ def prev_steps_must_be_complete(view_fn):
     """
     Decorator for checking that previous steps of the checkout
     are complete.
-    
+
     The completed steps (identified by URL-names) are stored in the session.
     If this fails, then we redirect to the next uncompleted step.
     """
     def _view_wrapper(self, request, *args, **kwargs):
         checker = ProgressChecker()
         if not checker.are_previous_steps_complete(request):
-            messages.error(request, _("You must complete this step of the checkout first"))
+            messages.error(request, _("You must complete this step of the"
+                                      " checkout first"))
             url_name = checker.get_next_step(request)
             return HttpResponseRedirect(reverse(url_name))
         return view_fn(self, request, *args, **kwargs)
@@ -31,10 +32,10 @@ def basket_required(view_fn):
     or has a frozen one in the session
     """
     def _view_wrapper(self, request, *args, **kwargs):
-        if request.basket.is_empty and not 'checkout_basket_id' in request.session:
-            messages.error(request, _("You must add some products to your basket before checking out"))
+        if request.basket.is_empty \
+                and not 'checkout_basket_id' in request.session:
+            messages.error(request, _("You must add some products to your"
+                                      " basket before checking out"))
             return HttpResponseRedirect(reverse('oscar-basket'))
         return view_fn(self, request, *args, **kwargs)
     return _view_wrapper
-
-

oscar/apps/checkout/mixins.py

@@ -206,7 +206,8 @@ class OrderPlacementMixin(CheckoutSessionMixin):
         shipping_addr.save()
         return shipping_addr
 
-    def create_billing_address(self, billing_address=None, shipping_address=None, **kwargs):
+    def create_billing_address(self, billing_address=None,
+                               shipping_address=None, **kwargs):
         """
         Saves any relevant billing data (eg a billing address).
         """

oscar/apps/checkout/utils.py

@@ -76,14 +76,16 @@ class CheckoutSessionData(object):
 
     def ship_to_user_address(self, address):
         """
-        Set existing shipping address id to session and unset address fields from session
+        Set existing shipping address id to session and unset address fields
+        from session
         """
         self.reset_shipping_data()
         self._set('shipping', 'user_address_id', address.id)
 
     def ship_to_new_address(self, address_fields):
         """
-        Set new shipping address details to session and unset shipping address id
+        Set new shipping address details to session and unset shipping address
+        id
         """
         self._unset('shipping', 'new_address_fields')
         self._set('shipping', 'new_address_fields', address_fields)
@@ -225,4 +227,3 @@ class CheckoutSessionData(object):
 
     def get_submitted_basket_id(self):
         return self._get('submission', 'basket_id')
-

oscar/apps/checkout/views.py

@@ -13,14 +13,19 @@ from django.views.generic import (DetailView, TemplateView, FormView,
 from oscar.apps.shipping.methods import NoShippingRequired
 from oscar.core.loading import get_class, get_classes
 
-ShippingAddressForm, GatewayForm = get_classes('checkout.forms', ['ShippingAddressForm', 'GatewayForm'])
-pre_payment, post_payment = get_classes('checkout.signals', ['pre_payment', 'post_payment'])
-OrderNumberGenerator, OrderCreator = get_classes('order.utils', ['OrderNumberGenerator', 'OrderCreator'])
+ShippingAddressForm, GatewayForm \
+    = get_classes('checkout.forms', ['ShippingAddressForm', 'GatewayForm'])
+pre_payment, post_payment \
+    = get_classes('checkout.signals', ['pre_payment', 'post_payment'])
+OrderNumberGenerator, OrderCreator \
+    = get_classes('order.utils', ['OrderNumberGenerator', 'OrderCreator'])
 UserAddressForm = get_class('address.forms', 'UserAddressForm')
 Repository = get_class('shipping.repository', 'Repository')
 AccountAuthView = get_class('customer.views', 'AccountAuthView')
-RedirectRequired, UnableToTakePayment, PaymentError = get_classes(
-    'payment.exceptions', ['RedirectRequired', 'UnableToTakePayment', 'PaymentError'])
+RedirectRequired, UnableToTakePayment, PaymentError \
+    = get_classes('payment.exceptions', ['RedirectRequired',
+                                         'UnableToTakePayment',
+                                         'PaymentError'])
 UnableToPlaceOrder = get_class('order.exceptions', 'UnableToPlaceOrder')
 OrderPlacementMixin = get_class('checkout.mixins', 'OrderPlacementMixin')
 CheckoutSessionMixin = get_class('checkout.session', 'CheckoutSessionMixin')
@@ -102,13 +107,14 @@ class ShippingAddressView(CheckoutSessionMixin, FormView):
     Determine the shipping address for the order.
 
     The default behaviour is to display a list of addresses from the users's
-    address book, from which the user can choose one to be their shipping address.
-    They can add/edit/delete these USER addresses.  This address will be
-    automatically converted into a SHIPPING address when the user checks out.
+    address book, from which the user can choose one to be their shipping
+    address.  They can add/edit/delete these USER addresses.  This address will
+    be automatically converted into a SHIPPING address when the user checks
+    out.
 
     Alternatively, the user can enter a SHIPPING address directly which will be
-    saved in the session and later saved as ShippingAddress model when the order
-    is sucessfully submitted.
+    saved in the session and later saved as ShippingAddress model when the
+    order is sucessfully submitted.
     """
     template_name = 'checkout/shipping_address.html'
     form_class = ShippingAddressForm
@@ -116,18 +122,22 @@ class ShippingAddressView(CheckoutSessionMixin, FormView):
     def get(self, request, *args, **kwargs):
         # Check that the user's basket is not empty
         if request.basket.is_empty:
-            messages.error(request, _("You need to add some items to your basket to checkout"))
+            messages.error(request, _("You need to add some items to your"
+                                      " basket to checkout"))
             return HttpResponseRedirect(reverse('basket:summary'))
 
         # Check that guests have entered an email address
-        if not request.user.is_authenticated() and not self.checkout_session.get_guest_email():
-            messages.error(request, _("Please either sign in or enter your email address"))
+        if not request.user.is_authenticated() \
+                and not self.checkout_session.get_guest_email():
+            messages.error(request, _("Please either sign in or enter your"
+                                      " email address"))
             return HttpResponseRedirect(reverse('checkout:index'))
 
-        # Check to see that a shipping address is actually required.  It may not be if
-        # the basket is purely downloads
+        # Check to see that a shipping address is actually required.  It may
+        # not be if the basket is purely downloads
         if not request.basket.is_shipping_required():
-            messages.info(request, _("Your basket does not require a shipping address to be submitted"))
+            messages.info(request, _("Your basket does not require a shipping"
+                                     " address to be submitted"))
             return HttpResponseRedirect(self.get_success_url())
 
         return super(ShippingAddressView, self).get(request, *args, **kwargs)
@@ -145,12 +155,13 @@ class ShippingAddressView(CheckoutSessionMixin, FormView):
     def get_available_addresses(self):
         return self.request.user.addresses.filter(
             country__is_shipping_country=True).order_by(
-                '-is_default_for_shipping')
+            '-is_default_for_shipping')
 
     def post(self, request, *args, **kwargs):
         # Check if a shipping address was selected directly (eg no form was
         # filled in)
-        if self.request.user.is_authenticated() and 'address_id' in self.request.POST:
+        if self.request.user.is_authenticated() \
+                and 'address_id' in self.request.POST:
             address = UserAddress._default_manager.get(
                 pk=self.request.POST['address_id'], user=self.request.user)
             action = self.request.POST.get('action', None)
@@ -161,8 +172,10 @@ class ShippingAddressView(CheckoutSessionMixin, FormView):
             elif action == 'delete':
                 # Delete the selected address
                 address.delete()
-                messages.info(self.request, _("Address deleted from your address book"))
-                return HttpResponseRedirect(reverse('checkout:shipping-method'))
+                messages.info(self.request, _("Address deleted from your"
+                                              " address book"))
+                return HttpResponseRedirect(
+                    reverse('checkout:shipping-method'))
             else:
                 return HttpResponseBadRequest()
         else:
@@ -237,12 +250,14 @@ class ShippingMethodView(CheckoutSessionMixin, TemplateView):
     def get(self, request, *args, **kwargs):
         # Check that the user's basket is not empty
         if request.basket.is_empty:
-            messages.error(request, _("You need to add some items to your basket to checkout"))
+            messages.error(request, _("You need to add some items to your"
+                                      " basket to checkout"))
             return HttpResponseRedirect(reverse('basket:summary'))
 
         # Check that shipping is required at all
         if not request.basket.is_shipping_required():
-            self.checkout_session.use_shipping_method(NoShippingRequired().code)
+            self.checkout_session.use_shipping_method(
+                NoShippingRequired().code)
             return self.get_success_response()
 
         # Check that shipping address has been completed
@@ -255,10 +270,13 @@ class ShippingMethodView(CheckoutSessionMixin, TemplateView):
         self._methods = self.get_available_shipping_methods()
         if len(self._methods) == 0:
             # No shipping methods available for given address
-            messages.warning(request, _("Shipping is unavailable for your chosen address - please choose another"))
+            messages.warning(request, _("Shipping is unavailable for your"
+                                        " chosen address - please choose"
+                                        " another"))
             return HttpResponseRedirect(reverse('checkout:shipping-address'))
         elif len(self._methods) == 1:
-            # Only one shipping method - set this and redirect onto the next step
+            # Only one shipping method - set this and redirect onto the next
+            # step
             self.checkout_session.use_shipping_method(self._methods[0].code)
             return self.get_success_response()
 
@@ -292,7 +310,8 @@ class ShippingMethodView(CheckoutSessionMixin, TemplateView):
             if method.code == method_code:
                 is_valid = True
         if not is_valid:
-            messages.error(request, _("Your submitted shipping method is not permitted"))
+            messages.error(request, _("Your submitted shipping method is not"
+                                      " permitted"))
             return HttpResponseRedirect(reverse('checkout:shipping-method'))
 
         # Save the code for the chosen shipping method in the session
@@ -320,18 +339,22 @@ class PaymentMethodView(CheckoutSessionMixin, TemplateView):
     def get(self, request, *args, **kwargs):
         # Check that the user's basket is not empty
         if request.basket.is_empty:
-            messages.error(request, _("You need to add some items to your basket to checkout"))
+            messages.error(request, _("You need to add some items to your"
+                                      " basket to checkout"))
             return HttpResponseRedirect(reverse('basket:summary'))
 
         shipping_required = request.basket.is_shipping_required()
 
         # Check that shipping address has been completed
-        if shipping_required and not self.checkout_session.is_shipping_address_set():
+        if shipping_required \
+                and not self.checkout_session.is_shipping_address_set():
             messages.error(request, _("Please choose a shipping address"))
             return HttpResponseRedirect(reverse('checkout:shipping-address'))
 
         # Check that shipping method has been set
-        if shipping_required and not self.checkout_session.is_shipping_method_set(self.request.basket):
+        if shipping_required \
+                and not self.checkout_session.is_shipping_method_set(
+                    self.request.basket):
             messages.error(request, _("Please choose a shipping method"))
             return HttpResponseRedirect(reverse('checkout:shipping-method'))
 
@@ -667,13 +690,16 @@ class ThankYouView(DetailView):
         order = None
         if self.request.user.is_superuser:
             if 'order_number' in self.request.GET:
-                order = Order._default_manager.get(number=self.request.GET['order_number'])
+                order = Order._default_manager.get(
+                    number=self.request.GET['order_number'])
             elif 'order_id' in self.request.GET:
-                order = Order._default_manager.get(id=self.request.GET['orderid'])
+                order = Order._default_manager.get(
+                    id=self.request.GET['orderid'])
 
         if not order:
             if 'checkout_order_id' in self.request.session:
-                order = Order._default_manager.get(pk=self.request.session['checkout_order_id'])
+                order = Order._default_manager.get(
+                    pk=self.request.session['checkout_order_id'])
             else:
                 raise Http404(_("No order found"))
 

oscar/apps/customer/abstract_models.py

@@ -43,7 +43,6 @@ if hasattr(auth_models, 'BaseUserManager'):
             u.save(using=self._db)
             return u
 
-
     class AbstractUser(auth_models.AbstractBaseUser,
                        auth_models.PermissionsMixin):
         """
@@ -65,7 +64,8 @@ if hasattr(auth_models, 'BaseUserManager'):
             _('Active'), default=True,
             help_text=_('Designates whether this user should be treated as '
                         'active. Unselect this instead of deleting accounts.'))
-        date_joined = models.DateTimeField(_('date joined'), default=timezone.now)
+        date_joined = models.DateTimeField(_('date joined'),
+                                           default=timezone.now)
 
         objects = UserManager()
 
@@ -89,7 +89,8 @@ class AbstractEmail(models.Model):
     This is a record of all emails sent to a customer.
     Normally, we only record order-related emails.
     """
-    user = models.ForeignKey(AUTH_USER_MODEL, related_name='emails', verbose_name=_("User"))
+    user = models.ForeignKey(AUTH_USER_MODEL, related_name='emails',
+                             verbose_name=_("User"))
     subject = models.TextField(_('Subject'), max_length=255)
     body_text = models.TextField(_("Body Text"))
     body_html = models.TextField(_("Body HTML"), blank=True, null=True)
@@ -181,7 +182,6 @@ class AbstractCommunicationEventType(models.Model):
                 except TemplateDoesNotExist:
                     templates[name] = None
 
-
         # Pass base URL for serving images within HTML emails
         if ctx is None:
             ctx = {}
@@ -193,7 +193,8 @@ class AbstractCommunicationEventType(models.Model):
             messages[name] = template.render(Context(ctx)) if template else ''
 
         # Ensure the email subject doesn't contain any newlines
-        messages['subject'] = messages['subject'].replace("\n", "").replace("\r", "")
+        messages['subject'] = messages['subject'].replace("\n", "")
+        messages['subject'] = messages['subject'].replace("\r", "")
 
         return messages
 
@@ -208,8 +209,8 @@ class AbstractCommunicationEventType(models.Model):
 
 
 class AbstractNotification(models.Model):
-    recipient = models.ForeignKey(AUTH_USER_MODEL, related_name='notifications',
-                                  db_index=True)
+    recipient = models.ForeignKey(AUTH_USER_MODEL,
+                                  related_name='notifications', db_index=True)
 
     # Not all notifications will have a sender.
     sender = models.ForeignKey(AUTH_USER_MODEL, null=True)
@@ -258,8 +259,9 @@ class AbstractProductAlert(models.Model):
     # A user is only required if the notification is created by a
     # registered user, anonymous users will only have an email address
     # attached to the notification
-    user = models.ForeignKey(AUTH_USER_MODEL, db_index=True, blank=True, null=True,
-                             related_name="alerts", verbose_name=_('User'))
+    user = models.ForeignKey(AUTH_USER_MODEL, db_index=True, blank=True,
+                             null=True, related_name="alerts",
+                             verbose_name=_('User'))
     email = models.EmailField(_("Email"), db_index=True, blank=True, null=True)
 
     # This key are used to confirm and cancel alerts for anon users
@@ -344,7 +346,8 @@ class AbstractProductAlert(models.Model):
         # calls save, and doesn't call the methods cancel(), confirm() etc).
         if self.status == self.CANCELLED and self.date_cancelled is None:
             self.date_cancelled = timezone.now()
-        if not self.user and self.status == self.ACTIVE and self.date_confirmed is None:
+        if not self.user and self.status == self.ACTIVE \
+                and self.date_confirmed is None:
             self.date_confirmed = timezone.now()
         if self.status == self.CLOSED and self.date_closed is None:
             self.date_closed = timezone.now()
@@ -362,4 +365,5 @@ class AbstractProductAlert(models.Model):
         return reverse('customer:alerts-confirm', kwargs={'key': self.key})
 
     def get_cancel_url(self):
-        return reverse('customer:alerts-cancel-by-key', kwargs={'key': self.key})
+        return reverse('customer:alerts-cancel-by-key', kwargs={'key':
+                                                                self.key})

oscar/apps/customer/alerts/utils.py

@@ -36,8 +36,10 @@ def send_alert_confirmation(alert):
         'alert': alert,
         'site': Site.objects.get_current(),
     })
-    subject_tpl = loader.get_template('customer/alerts/emails/confirmation_subject.txt')
-    body_tpl = loader.get_template('customer/alerts/emails/confirmation_body.txt')
+    subject_tpl = loader.get_template('customer/alerts/emails/'
+                                      'confirmation_subject.txt')
+    body_tpl = loader.get_template('customer/alerts/emails/'
+                                   'confirmation_body.txt')
     mail.send_mail(
         subject_tpl.render(ctx).strip(),
         body_tpl.render(ctx),
@@ -74,8 +76,10 @@ def send_product_alerts(product):
 
     # Load templates
     message_tpl = loader.get_template('customer/alerts/message.html')
-    email_subject_tpl = loader.get_template('customer/alerts/emails/alert_subject.txt')
-    email_body_tpl = loader.get_template('customer/alerts/emails/alert_body.txt')
+    email_subject_tpl = loader.get_template('customer/alerts/emails/'
+                                            'alert_subject.txt')
+    email_body_tpl = loader.get_template('customer/alerts/emails/'
+                                         'alert_body.txt')
 
     emails = []
     num_notifications = 0
@@ -116,4 +120,5 @@ def send_product_alerts(product):
         connection.send_messages(emails)
         connection.close()
 
-    logger.info("Sent %d notifications and %d emails", num_notifications, len(emails))
+    logger.info("Sent %d notifications and %d emails", num_notifications,
+                len(emails))

oscar/apps/customer/alerts/views.py

@@ -50,7 +50,8 @@ class ProductAlertCreateView(generic.CreateView):
 
     def post(self, request, *args, **kwargs):
         self.product = get_object_or_404(Product, pk=self.kwargs['pk'])
-        return super(ProductAlertCreateView, self).post(request, *args, **kwargs)
+        return super(ProductAlertCreateView, self).post(request, *args,
+                                                        **kwargs)
 
     def get_form_kwargs(self):
         kwargs = super(ProductAlertCreateView, self).get_form_kwargs()
@@ -68,7 +69,8 @@ class ProductAlertCreateView(generic.CreateView):
         if self.object.user:
             msg = _("An alert has been created")
         else:
-            msg = _("A confirmation email has been sent to %s") % self.object.email
+            msg = _("A confirmation email has been sent to %s") \
+                % self.object.email
         messages.success(self.request, msg)
         return self.object.product.get_absolute_url()
 
@@ -79,14 +81,16 @@ class ProductAlertConfirmView(generic.RedirectView):
     def get(self, request, *args, **kwargs):
         self.alert = get_object_or_404(ProductAlert, key=kwargs['key'])
         self.update_alert()
-        return super(ProductAlertConfirmView, self).get(request, *args, **kwargs)
+        return super(ProductAlertConfirmView, self).get(request, *args,
+                                                        **kwargs)
 
     def update_alert(self):
         if self.alert.can_be_confirmed:
             self.alert.confirm()
             messages.success(self.request, _("Your stock alert is now active"))
         else:
-            messages.error(self.request, _("Your stock alert cannot be confirmed"))
+            messages.error(self.request, _("Your stock alert cannot be"
+                                           " confirmed"))
 
     def get_redirect_url(self, **kwargs):
         return self.alert.product.get_absolute_url()
@@ -98,26 +102,32 @@ class ProductAlertCancelView(generic.RedirectView):
     anonymously created alerts) or the pk (used for alerts created by a
     authenticated user).
 
-    Specifying the redirect url is possible by supplying a 'next' GET parameter.
-    It defaults to showing the associated product page.
+    Specifying the redirect url is possible by supplying a 'next' GET
+    parameter.  It defaults to showing the associated product page.
     """
 
     def get(self, request, *args, **kwargs):
         if 'key' in kwargs:
             self.alert = get_object_or_404(ProductAlert, key=kwargs['key'])
         elif 'pk' in kwargs and request.user.is_authenticated():
-            self.alert = get_object_or_404(ProductAlert, user=self.request.user, pk=kwargs['pk'])
+            self.alert = get_object_or_404(ProductAlert,
+                                           user=self.request.user,
+                                           pk=kwargs['pk'])
         else:
             raise Http404
         self.update_alert()
-        return super(ProductAlertCancelView, self).get(request, *args, **kwargs)
+        return super(ProductAlertCancelView, self).get(request, *args,
+                                                       **kwargs)
 
     def update_alert(self):
         if self.alert.can_be_cancelled:
             self.alert.cancel()
-            messages.success(self.request, _("Your stock alert has been cancelled"))
+            messages.success(self.request, _("Your stock alert has been"
+                                             " cancelled"))
         else:
-            messages.error(self.request, _("Your stock alert cannot be cancelled"))
+            messages.error(self.request, _("Your stock alert cannot be"
+                                           " cancelled"))
 
     def get_redirect_url(self, **kwargs):
-        return self.request.GET.get('next', self.alert.product.get_absolute_url())
+        return self.request.GET.get('next',
+                                    self.alert.product.get_absolute_url())

oscar/apps/customer/app.py

@@ -50,10 +50,11 @@ class CustomerApplication(Application):
     wishlists_update_view = wishlists_views.WishListUpdateView
     wishlists_delete_view = wishlists_views.WishListDeleteView
     wishlists_remove_product_view = wishlists_views.WishListRemoveProduct
-    wishlists_move_product_to_another_view = wishlists_views.WishListMoveProductToAnotherWishList
+    wishlists_move_product_to_another_view \
+        = wishlists_views.WishListMoveProductToAnotherWishList
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             url(r'^$', login_required(self.summary_view.as_view()),
                 name='summary'),
             url(r'^login/$', self.login_view.as_view(), name='login'),
@@ -96,7 +97,8 @@ class CustomerApplication(Application):
             url(r'^addresses/(?P<pk>\d+)/delete/$',
                 login_required(self.address_delete_view.as_view()),
                 name='address-delete'),
-            url(r'^addresses/(?P<pk>\d+)/(?P<action>default_for_(billing|shipping))/$',
+            url(r'^addresses/(?P<pk>\d+)/'
+                r'(?P<action>default_for_(billing|shipping))/$',
                 login_required(self.address_change_status_view.as_view()),
                 name='address-change-status'),
 
@@ -168,14 +170,16 @@ class CustomerApplication(Application):
             url(r'wishlists/(?P<key>[a-z0-9]+)/lines/(?P<line_pk>\d+)/delete/',
                 login_required(self.wishlists_remove_product_view.as_view()),
                 name='wishlists-remove-product'),
-            url(r'wishlists/(?P<key>[a-z0-9]+)/products/(?P<product_pk>\d+)/delete/',
+            url(r'wishlists/(?P<key>[a-z0-9]+)/products/(?P<product_pk>\d+)/'
+                r'delete/',
                 login_required(self.wishlists_remove_product_view.as_view()),
                 name='wishlists-remove-product'),
-            url(r'wishlists/(?P<key>[a-z0-9]+)/lines/(?P<line_pk>\d+)/move-to/(?P<to_key>[a-z0-9]+)/$',
-                login_required(self.wishlists_move_product_to_another_view.as_view()),
-                name='wishlists-move-product-to-another'),
-            )
-        return self.post_process_urls(urlpatterns)
+            url(r'wishlists/(?P<key>[a-z0-9]+)/lines/(?P<line_pk>\d+)/move-to/'
+                r'(?P<to_key>[a-z0-9]+)/$',
+                login_required(self.wishlists_move_product_to_another_view
+                               .as_view()),
+                name='wishlists-move-product-to-another')]
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = CustomerApplication()

oscar/apps/customer/auth_backends.py

@@ -50,8 +50,9 @@ class Emailbackend(ModelBackend):
             # either.  This situation requires intervention by an admin and so
             # we mail them to let them know!
             mail_admins(
-                "There are multiple users with email address: %s" % clean_email,
+                "There are multiple users with email address: %s"
+                % clean_email,
                 ("There are %s users with email %s and the same password "
-                 "which means none of them are able to authenticate") % (len(authenticated_users),
-                                                clean_email))
+                 "which means none of them are able to authenticate")
+                % (len(authenticated_users), clean_email))
         return None

oscar/apps/customer/forms.py

@@ -25,7 +25,8 @@ User = get_user_model()
 
 
 def generate_username():
-    uname = ''.join([random.choice(string.letters + string.digits + '_') for i in range(30)])
+    uname = ''.join([random.choice(string.letters + string.digits + '_')
+                     for i in range(30)])
     try:
         User.objects.get(username=uname)
         return generate_username()
@@ -93,7 +94,8 @@ class EmailAuthenticationForm(AuthenticationForm):
 
 
 class CommonPasswordValidator(validators.BaseValidator):
-    # See http://www.smartplanet.com/blog/business-brains/top-20-most-common-passwords-of-all-time-revealed-8216123456-8216princess-8216qwerty/4519
+    # See
+    # http://www.smartplanet.com/blog/business-brains/top-20-most-common-passwords-of-all-time-revealed-8216123456-8216princess-8216qwerty/4519  # noqa
     forbidden_passwords = [
         'password',
         '1234',

oscar/apps/customer/mixins.py

@@ -76,6 +76,3 @@ class RegisterUserMixin(object):
             code, ctx)
         if messages and messages['body']:
             Dispatcher().dispatch_user_messages(user, messages)
-
-
-

oscar/apps/customer/models.py

@@ -17,5 +17,5 @@ class ProductAlert(abstract_models.AbstractProductAlert):
     pass
 
 
-from oscar.apps.customer.history import *
-from oscar.apps.customer.alerts.receivers import *
+from oscar.apps.customer.history import *  # noqa
+from oscar.apps.customer.alerts.receivers import *  # noqa

oscar/apps/customer/notifications/views.py

@@ -91,8 +91,8 @@ class UpdateView(BulkEditMixin, generic.RedirectView):
             notification.archive()
         msg = ungettext(
             '%(count)d notification archived',
-            '%(count)d notifications archived', len(notifications)) % {
-                'count': len(notifications)}
+            '%(count)d notifications archived', len(notifications)) \
+            % {'count': len(notifications)}
         messages.success(request, msg)
         return self.get_success_response()
 
@@ -101,7 +101,7 @@ class UpdateView(BulkEditMixin, generic.RedirectView):
             notification.delete()
         msg = ungettext(
             '%(count)d notification deleted',
-            '%(count)d notifications deleted', len(notifications)) % {
-                'count': len(notifications)}
+            '%(count)d notifications deleted', len(notifications)) \
+            % {'count': len(notifications)}
         messages.success(request, msg)
         return self.get_success_response()

oscar/apps/customer/utils.py

@@ -59,10 +59,12 @@ class Dispatcher(object):
 
     def send_user_email_messages(self, user, messages):
         """
-        Sends message to the registered user / customer and collects data in database
+        Sends message to the registered user / customer and collects data in
+        database
         """
         if not user.email:
-            self.logger.warning("Unable to send email messages as user #%d has no email address", user.id)
+            self.logger.warning("Unable to send email messages as user #%d has"
+                                " no email address", user.id)
             return
 
         email = self.send_email_messages(user.email, messages)
@@ -115,8 +117,9 @@ def get_password_reset_url(user, token_generator=default_token_generator):
 
 def normalise_email(email):
     """
-    The local part of an email address is case-sensitive, the domain part isn't.
-    This function lowercases the host and should be used in all email handling.
+    The local part of an email address is case-sensitive, the domain part
+    isn't.  This function lowercases the host and should be used in all email
+    handling.
     """
     clean_email = email.strip()
     if '@' in clean_email:

oscar/apps/customer/views.py

@@ -143,12 +143,12 @@ class AccountAuthView(RegisterUserMixin, TemplateView):
         kwargs['prefix'] = self.registration_prefix
         kwargs['initial'] = {
             'redirect_url': self.request.GET.get(self.redirect_field_name, ''),
-            }
+        }
         if request and request.method in ('POST', 'PUT'):
             kwargs.update({
                 'data': request.POST,
                 'files': request.FILES,
-                })
+            })
         return kwargs
 
     def post(self, request, *args, **kwargs):
@@ -313,7 +313,7 @@ class ChangePasswordView(PageTitleMixin, FormView):
             'user': self.request.user,
             'site': get_current_site(self.request),
             'reset_url': get_password_reset_url(self.request.user),
-            }
+        }
         msgs = CommunicationEventType.objects.get_and_render(
             code=self.communication_type_code, context=ctx)
         Dispatcher().dispatch_user_messages(self.request.user, msgs)
@@ -496,7 +496,8 @@ class OrderLineView(PostActionMixin, DetailView):
 
     def do_reorder(self, line):
         self.response = HttpResponseRedirect(
-            reverse('customer:order', args=(int(self.kwargs['order_number']),)))
+            reverse('customer:order',
+                    args=(int(self.kwargs['order_number']),)))
         basket = self.request.basket
 
         line_available_to_reorder, reason = line.is_available_to_reorder(
@@ -519,7 +520,8 @@ class OrderLineView(PostActionMixin, DetailView):
         basket.add_product(line.product, line.quantity, options)
 
         if line.quantity > 1:
-            msg = _("%(qty)d copies of '%(product)s' have been added to your basket") % {
+            msg = _("%(qty)d copies of '%(product)s' have been added to your"
+                    " basket") % {
                 'qty': line.quantity, 'product': line.product}
         else:
             msg = _("'%s' has been added to your basket") % line.product

oscar/apps/customer/wishlists/views.py

@@ -6,7 +6,8 @@ from django.core.urlresolvers import reverse
 from django.db.models import get_model
 from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import get_object_or_404
-from django.views.generic import ListView, CreateView, UpdateView, DeleteView, View, FormView
+from django.views.generic import (ListView, CreateView, UpdateView, DeleteView,
+                                  View, FormView)
 from django.utils.translation import ugettext_lazy as _
 
 from oscar.apps.customer.mixins import PageTitleMixin
@@ -41,7 +42,8 @@ class WishListDetailView(PageTitleMixin, FormView):
 
     def dispatch(self, request, *args, **kwargs):
         self.object = self.get_wishlist_or_404(kwargs['key'], request.user)
-        return super(WishListDetailView, self).dispatch(request, *args, **kwargs)
+        return super(WishListDetailView, self).dispatch(request, *args,
+                                                        **kwargs)
 
     def get_wishlist_or_404(self, key, user):
         wishlist = get_object_or_404(WishList, key=key)
@@ -74,7 +76,7 @@ class WishListDetailView(PageTitleMixin, FormView):
                 subform.save()
         messages.success(self.request, _('Quantities updated.'))
         return HttpResponseRedirect(reverse('customer:wishlists-detail',
-                                            kwargs= {'key': self.object.key}))
+                                            kwargs={'key': self.object.key}))
 
 
 class WishListCreateView(PageTitleMixin, CreateView):
@@ -117,8 +119,8 @@ class WishListCreateView(PageTitleMixin, CreateView):
         if self.product:
             wishlist.add(self.product)
             msg = _("Your wishlist has been created and '%(name)s "
-                    "has been added") % {
-                        'name': self.product.get_title()}
+                    "has been added") \
+                % {'name': self.product.get_title()}
         else:
             msg = _("Your wishlist has been created")
         messages.success(self.request, msg)
@@ -169,7 +171,8 @@ class WishListUpdateView(PageTitleMixin, UpdateView):
 
     def get_success_url(self):
         messages.success(
-            self.request, _("Your '%s' wishlist has been updated") % self.object.name)
+            self.request, _("Your '%s' wishlist has been updated")
+            % self.object.name)
         return reverse('customer:wishlists-list')
 
 
@@ -187,7 +190,8 @@ class WishListDeleteView(PageTitleMixin, DeleteView):
 
     def get_success_url(self):
         messages.success(
-            self.request, _("Your '%s' wish list has been deleted") % self.object.name)
+            self.request, _("Your '%s' wish list has been deleted")
+            % self.object.name)
         return reverse('customer:wishlists-list')
 
 

oscar/apps/dashboard/app.py

@@ -26,7 +26,7 @@ class DashboardApplication(Application):
     comms_app = get_class('dashboard.communications.app', 'application')
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             url(r'^$', self.index_view.as_view(), name='index'),
             url(r'^catalogue/', include(self.catalogue_app.urls)),
             url(r'^reports/', include(self.reports_app.urls)),
@@ -40,8 +40,8 @@ class DashboardApplication(Application):
             url(r'^reviews/', include(self.reviews_app.urls)),
             url(r'^vouchers/', include(self.vouchers_app.urls)),
             url(r'^comms/', include(self.comms_app.urls)),
-        )
-        return self.post_process_urls(urlpatterns)
+        ]
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = DashboardApplication()

oscar/apps/dashboard/catalogue/app.py

@@ -9,11 +9,14 @@ class CatalogueApplication(Application):
 
     default_permissions = ['is_staff', ]
     permissions_map = _map = {
-        'catalogue-product':        (['is_staff'], ['partner.dashboard_access']),
-        'catalogue-product-create': (['is_staff'], ['partner.dashboard_access']),
-        'catalogue-product-list':   (['is_staff'], ['partner.dashboard_access']),
-        'catalogue-product-delete': (['is_staff'], ['partner.dashboard_access']),
-        'catalogue-product-lookup': (['is_staff'], ['partner.dashboard_access']),
+        'catalogue-product': (['is_staff'], ['partner.dashboard_access']),
+        'catalogue-product-create': (['is_staff'],
+                                     ['partner.dashboard_access']),
+        'catalogue-product-list': (['is_staff'], ['partner.dashboard_access']),
+        'catalogue-product-delete': (['is_staff'],
+                                     ['partner.dashboard_access']),
+        'catalogue-product-lookup': (['is_staff'],
+                                     ['partner.dashboard_access']),
     }
 
     product_list_view = views.ProductListView
@@ -31,7 +34,7 @@ class CatalogueApplication(Application):
     stock_alert_view = views.StockAlertListView
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             url(r'^products/(?P<pk>\d+)/$',
                 self.product_createupdate_view.as_view(),
                 name='catalogue-product'),
@@ -63,8 +66,8 @@ class CatalogueApplication(Application):
             url(r'^categories/(?P<pk>\d+)/delete/$',
                 self.category_delete_view.as_view(),
                 name='catalogue-category-delete'),
-        )
-        return self.post_process_urls(urlpatterns)
+        ]
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = CatalogueApplication()

oscar/apps/dashboard/catalogue/forms.py

@@ -18,7 +18,8 @@ ProductCategory = get_model('catalogue', 'ProductCategory')
 ProductImage = get_model('catalogue', 'ProductImage')
 ProductRecommendation = get_model('catalogue', 'ProductRecommendation')
 ProductSelect = get_class('dashboard.catalogue.widgets', 'ProductSelect')
-ProductSelectMultiple = get_class('dashboard.catalogue.widgets', 'ProductSelectMultiple')
+ProductSelectMultiple = get_class('dashboard.catalogue.widgets',
+                                  'ProductSelectMultiple')
 
 
 class BaseCategoryForm(MoveNodeForm):
@@ -47,7 +48,9 @@ class BaseCategoryForm(MoveNodeForm):
             parent = None
 
         # build full slug
-        slug_prefix = (parent.slug + Category._slug_separator) if parent else ''
+        slug_prefix = ''
+        if parent:
+            slug_prefix = (parent.slug + Category._slug_separator)
         slug = '%s%s' % (slug_prefix, slugify(name))
 
         # check if slug is conflicting
@@ -141,7 +144,10 @@ class StockRecordFormSet(BaseStockRecordFormSet):
                                         for form in self.forms])
             user_partners = set(self.user.partners.all())
             if not user_partners & stockrecord_partners:
-                raise ValidationError(_("At least one stock record must be set to a partner that you're associated with."))
+                raise ValidationError(_("At least one stock record must be set"
+                                        " to a partner that you're associated"
+                                        " with."))
+
 
 def _attr_text_field(attribute):
     return forms.CharField(label=attribute.name,
@@ -258,8 +264,8 @@ class ProductForm(forms.ModelForm):
 
     def add_attribute_fields(self):
         for attribute in self.product_class.attributes.all():
-            self.fields['attr_%s' % attribute.code] = \
-                    self.get_attribute_field(attribute)
+            self.fields['attr_%s' % attribute.code] \
+                = self.get_attribute_field(attribute)
 
     def get_attribute_field(self, attribute):
         return self.FIELD_FACTORIES[attribute.type](attribute)
@@ -334,7 +340,7 @@ class BaseProductCategoryFormSet(BaseInlineFormSet):
             form = self.forms[i]
             if (hasattr(form, 'cleaned_data')
                     and form.cleaned_data.get('category', None)
-                    and form.cleaned_data.get('DELETE', False) != True):
+                    and not form.cleaned_data.get('DELETE', False)):
                 num_categories += 1
         return num_categories
 

oscar/apps/dashboard/catalogue/views.py

@@ -17,16 +17,16 @@ from oscar.views.generic import ObjectLookupView
  StockAlertSearchForm,
  ProductCategoryFormSet,
  ProductImageFormSet,
- ProductRecommendationFormSet) = get_classes(
-     'dashboard.catalogue.forms',
-     ('ProductForm',
-      'ProductSearchForm',
-      'CategoryForm',
-      'StockRecordFormSet',
-      'StockAlertSearchForm',
-      'ProductCategoryFormSet',
-      'ProductImageFormSet',
-      'ProductRecommendationFormSet'))
+ ProductRecommendationFormSet) \
+    = get_classes('dashboard.catalogue.forms',
+                  ('ProductForm',
+                   'ProductSearchForm',
+                   'CategoryForm',
+                   'StockRecordFormSet',
+                   'StockAlertSearchForm',
+                   'ProductCategoryFormSet',
+                   'ProductImageFormSet',
+                   'ProductRecommendationFormSet'))
 Product = get_model('catalogue', 'Product')
 Category = get_model('catalogue', 'Category')
 ProductImage = get_model('catalogue', 'ProductImage')
@@ -71,7 +71,8 @@ class ProductListView(generic.ListView):
         ctx['product_classes'] = ProductClass.objects.all()
         ctx['form'] = self.form
         if 'recently_edited' in self.request.GET:
-            ctx['queryset_description'] = _("Last %(num_products)d edited products") \
+            ctx['queryset_description'] \
+                = _("Last %(num_products)d edited products") \
                 % {'num_products': self.recent_products}
         else:
             ctx['queryset_description'] = self.description
@@ -184,11 +185,13 @@ class ProductCreateUpdateView(generic.UpdateView):
             ctx['stockrecord_formset'] = self.stockrecord_formset(
                 self.product_class, self.request.user, instance=self.object)
         if 'category_formset' not in ctx:
-            ctx['category_formset'] = self.category_formset(instance=self.object)
+            ctx['category_formset'] \
+                = self.category_formset(instance=self.object)
         if 'image_formset' not in ctx:
             ctx['image_formset'] = self.image_formset(instance=self.object)
         if 'recommended_formset' not in ctx:
-            ctx['recommended_formset'] = self.recommendations_formset(instance=self.object)
+            ctx['recommended_formset'] \
+                = self.recommendations_formset(instance=self.object)
         if self.object is None:
             ctx['title'] = _('Create new %s product') % self.product_class.name
         else:
@@ -313,7 +316,7 @@ class ProductDeleteView(generic.DeleteView):
             raise PermissionDenied
 
     def get_success_url(self):
-        msg =_("Deleted product '%s'") % self.object.title
+        msg = _("Deleted product '%s'") % self.object.title
         messages.success(self.request, msg)
         return reverse('dashboard:catalogue-product-list')
 
@@ -358,7 +361,8 @@ class CategoryDetailListView(generic.DetailView):
     context_object_name = 'category'
 
     def get_context_data(self, *args, **kwargs):
-        ctx = super(CategoryDetailListView, self).get_context_data(*args, **kwargs)
+        ctx = super(CategoryDetailListView, self).get_context_data(*args,
+                                                                   **kwargs)
         ctx['child_categories'] = self.object.get_children()
         ctx['ancestors'] = self.object.get_ancestors()
         return ctx
@@ -372,7 +376,7 @@ class CategoryListMixin(object):
             return reverse("dashboard:catalogue-category-list")
         else:
             return reverse("dashboard:catalogue-category-detail-list",
-                            args=(parent.pk,))
+                           args=(parent.pk,))
 
 
 class CategoryCreateView(CategoryListMixin, generic.CreateView):
@@ -426,4 +430,5 @@ class ProductLookupView(ObjectLookupView):
         return self.model.browsable.all()
 
     def lookup_filter(self, qs, term):
-        return qs.filter(Q(title__icontains=term) | Q(parent__title__icontains=term))
+        return qs.filter(Q(title__icontains=term)
+                         | Q(parent__title__icontains=term))

oscar/apps/dashboard/communications/app.py

@@ -12,12 +12,12 @@ class CommsDashboardApplication(Application):
     update_view = views.UpdateView
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             url(r'^$', self.list_view.as_view(), name='comms-list'),
             url(r'^(?P<code>\w+)/$', self.update_view.as_view(),
                 name='comms-update'),
-        )
-        return self.post_process_urls(urlpatterns)
+        ]
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = CommsDashboardApplication()

oscar/apps/dashboard/communications/views.py

@@ -33,8 +33,8 @@ class UpdateView(generic.UpdateView):
 
     def form_invalid(self, form):
         messages.error(self.request,
-            _("The submitted form was not valid, please correct "
-              "the errors and resubmit"))
+                       _("The submitted form was not valid, please correct "
+                         "the errors and resubmit"))
         return super(UpdateView, self).form_invalid(form)
 
     def form_valid(self, form):

oscar/apps/dashboard/models.py

@@ -1 +0,0 @@
-

oscar/apps/dashboard/nav.py

@@ -58,9 +58,9 @@ class Node(object):
         # We can't assume that the view has the same parent module as the app,
         # as either the app or view can be customised. So we turn the module
         # string (e.g. 'oscar.apps.dashboard.catalogue.views') into an app
-        # label that can be loaded by get_class (e.g. 'dashboard.catalogue.app),
-        # which then essentially checks INSTALLED_APPS for the right module to
-        # load
+        # label that can be loaded by get_class (e.g.
+        # 'dashboard.catalogue.app), which then essentially checks
+        # INSTALLED_APPS for the right module to load
         match = re.search('(dashboard[\w\.]*)\.views$', view_module)
         if not match:
             raise exception
@@ -90,7 +90,8 @@ class Node(object):
             return None
         node = Node(
             label=self.label, url_name=self.url_name, url_args=self.url_args,
-            url_kwargs=self.url_kwargs, access_fn=self.access_fn, icon=self.icon
+            url_kwargs=self.url_kwargs, access_fn=self.access_fn,
+            icon=self.icon
         )
         for child in self.children:
             if child.is_visible(user):

oscar/apps/dashboard/offers/app.py

@@ -18,7 +18,7 @@ class OffersDashboardApplication(Application):
     detail_view = views.OfferDetailView
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             url(r'^$', self.list_view.as_view(), name='offer-list'),
             # Creation
             url(r'^new/name-and-description/$', self.metadata_view.as_view(),
@@ -48,8 +48,8 @@ class OffersDashboardApplication(Application):
             # Stats
             url(r'^(?P<pk>\d+)/$', self.detail_view.as_view(),
                 name='offer-detail'),
-        )
-        return self.post_process_urls(urlpatterns)
+        ]
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = OffersDashboardApplication()

oscar/apps/dashboard/offers/views.py

@@ -21,10 +21,10 @@ Range = get_model('offer', 'Range')
 Product = get_model('catalogue', 'Product')
 OrderDiscount = get_model('order', 'OrderDiscount')
 Benefit = get_model('offer', 'Benefit')
-MetaDataForm, ConditionForm, BenefitForm, RestrictionsForm, OfferSearchForm = get_classes(
-    'dashboard.offers.forms', [
-        'MetaDataForm', 'ConditionForm', 'BenefitForm', 'RestrictionsForm',
-        'OfferSearchForm'])
+MetaDataForm, ConditionForm, BenefitForm, RestrictionsForm, OfferSearchForm \
+    = get_classes('dashboard.offers.forms',
+                  ['MetaDataForm', 'ConditionForm', 'BenefitForm',
+                   'RestrictionsForm', 'OfferSearchForm'])
 OrderDiscountCSVFormatter = get_class(
     'dashboard.offers.reports', 'OrderDiscountCSVFormatter')
 
@@ -40,7 +40,7 @@ class OfferListView(ListView):
             offer_type=ConditionalOffer.SITE)
         qs = sort_queryset(qs, self.request,
                            ['name', 'start_date', 'end_date',
-                           'num_applications', 'total_discount'])
+                            'num_applications', 'total_discount'])
 
         self.description = _("All offers")
 
@@ -91,7 +91,8 @@ class OfferWizardStepView(FormView):
                 request, _("%s step not complete") % (
                     self.previous_view.step_name.title(),))
             return HttpResponseRedirect(self.get_back_url())
-        return super(OfferWizardStepView, self).dispatch(request, *args, **kwargs)
+        return super(OfferWizardStepView, self).dispatch(request, *args,
+                                                         **kwargs)
 
     def is_previous_step_complete(self, request):
         if not self.previous_view:
@@ -153,8 +154,8 @@ class OfferWizardStepView(FormView):
         json_qs = session_data.get(self._key(step_name, is_object=True), None)
         if json_qs:
             # Recreate model instance from passed data
-            deserialised_obj = list(serializers.deserialize('json', json_qs))[0]
-            return deserialised_obj.object
+            deserialised_obj = list(serializers.deserialize('json', json_qs))
+            return deserialised_obj[0].object
 
     def _fetch_session_offer(self):
         """

oscar/apps/dashboard/orders/app.py

@@ -8,11 +8,11 @@ class OrdersDashboardApplication(Application):
     name = None
     default_permissions = ['is_staff', ]
     permissions_map = {
-        'order-list':             (['is_staff'], ['partner.dashboard_access']),
-        'order-stats':            (['is_staff'], ['partner.dashboard_access']),
-        'order-detail':           (['is_staff'], ['partner.dashboard_access']),
-        'order-detail-note':      (['is_staff'], ['partner.dashboard_access']),
-        'order-line-detail':      (['is_staff'], ['partner.dashboard_access']),
+        'order-list': (['is_staff'], ['partner.dashboard_access']),
+        'order-stats': (['is_staff'], ['partner.dashboard_access']),
+        'order-detail': (['is_staff'], ['partner.dashboard_access']),
+        'order-detail-note': (['is_staff'], ['partner.dashboard_access']),
+        'order-line-detail': (['is_staff'], ['partner.dashboard_access']),
         'order-shipping-address': (['is_staff'], ['partner.dashboard_access']),
     }
 
@@ -23,9 +23,10 @@ class OrdersDashboardApplication(Application):
     order_stats_view = views.OrderStatsView
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             url(r'^$', self.order_list_view.as_view(), name='order-list'),
-            url(r'^statistics/$', self.order_stats_view.as_view(), name='order-stats'),
+            url(r'^statistics/$', self.order_stats_view.as_view(),
+                name='order-stats'),
             url(r'^(?P<number>[-\w]+)/$',
                 self.order_detail_view.as_view(), name='order-detail'),
             url(r'^(?P<number>[-\w]+)/notes/(?P<note_id>\d+)/$',
@@ -33,9 +34,10 @@ class OrdersDashboardApplication(Application):
             url(r'^(?P<number>[-\w]+)/lines/(?P<line_id>\d+)/$',
                 self.line_detail_view.as_view(), name='order-line-detail'),
             url(r'^(?P<number>[-\w]+)/shipping-address/$',
-                self.shipping_address_view.as_view(), name='order-shipping-address'),
-        )
-        return self.post_process_urls(urlpatterns)
+                self.shipping_address_view.as_view(),
+                name='order-shipping-address'),
+        ]
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = OrdersDashboardApplication()

oscar/apps/dashboard/orders/forms.py

@@ -29,12 +29,12 @@ class OrderStatsForm(forms.Form):
         date_from = self.cleaned_data['date_from']
         date_to = self.cleaned_data['date_to']
         if date_from and date_to:
-            # We want to include end date so we adjust the date we use with the 'range'
-            # function.
-            self._filters = {'date_placed__range': [date_from,
-                                                    date_to +
-                                                    datetime.timedelta(days=1)]}
-            self._description = _('Orders placed between %(date_from)s and %(date_to)s') % {
+            # We want to include end date so we adjust the date we use with the
+            # 'range' function.
+            self._filters = {'date_placed__range':
+                             [date_from, date_to + datetime.timedelta(days=1)]}
+            self._description = _('Orders placed between %(date_from)s and'
+                                  ' %(date_to)s') % {
                 'date_from': date_from,
                 'date_to': date_to}
         elif date_from and not date_to:
@@ -65,8 +65,11 @@ class OrderSearchForm(forms.Form):
     upc = forms.CharField(required=False, label=_("UPC"))
     partner_sku = forms.CharField(required=False, label=_("Partner SKU"))
 
-    status_choices = (('', '---------'),) + tuple([(v, v) for v in Order.all_statuses()])
-    status = forms.ChoiceField(choices=status_choices, label=_("Status"), required=False)
+    status_choices = (('', '---------'),) + tuple([(v, v)
+                                                   for v
+                                                   in Order.all_statuses()])
+    status = forms.ChoiceField(choices=status_choices, label=_("Status"),
+                               required=False)
 
     date_from = forms.DateField(required=False, label=_("Date from"))
     date_to = forms.DateField(required=False, label=_("Date to"))
@@ -79,8 +82,10 @@ class OrderSearchForm(forms.Form):
 
     format_choices = (('html', _('HTML')),
                       ('csv', _('CSV')),)
-    response_format = forms.ChoiceField(widget=forms.RadioSelect, required=False,
-        choices=format_choices, initial='html', label=_("Get results as"))
+    response_format = forms.ChoiceField(widget=forms.RadioSelect,
+                                        required=False, choices=format_choices,
+                                        initial='html',
+                                        label=_("Get results as"))
 
     def __init__(self, *args, **kwargs):
         # ensure that 'response_format' is always set
@@ -93,11 +98,12 @@ class OrderSearchForm(forms.Form):
         else:
             data = None
 
-        if data and data.get('response_format', None) not in self.format_choices:
-            # handle POST/GET dictionaries, whose are unmutable
-            if isinstance(data, QueryDict):
-                data = data.dict()
-            data['response_format'] = 'html'
+        if data:
+            if data.get('response_format', None) not in self.format_choices:
+                # handle POST/GET dictionaries, whose are unmutable
+                if isinstance(data, QueryDict):
+                    data = data.dict()
+                data['response_format'] = 'html'
 
         super(OrderSearchForm, self).__init__(data, *args, **kwargs)
         self.fields['payment_method'].choices = self.payment_method_choices()

oscar/apps/dashboard/orders/views.py

@@ -107,7 +107,8 @@ class OrderListView(BulkEditMixin, ListView):
     form_class = forms.OrderSearchForm
     desc_template = _("%(main_filter)s %(name_filter)s %(title_filter)s"
                       "%(upc_filter)s %(sku_filter)s %(date_filter)s"
-                      "%(voucher_filter)s %(payment_filter)s %(status_filter)s")
+                      "%(voucher_filter)s %(payment_filter)s"
+                      "%(status_filter)s")
     paginate_by = 25
     description = ''
     actions = ('download_selected_orders',)
@@ -158,37 +159,48 @@ class OrderListView(BulkEditMixin, ListView):
             return desc_ctx
 
         if data['order_number']:
-            desc_ctx['main_filter'] = _('Orders with number starting with "%s"') % data['order_number']
+            desc_ctx['main_filter'] = _('Orders with number starting with'
+                                        ' "%(order_number)s"') % data
 
         if data['name']:
-            desc_ctx['name_filter'] = _(" with customer name matching '%s'") % data['name']
+            desc_ctx['name_filter'] = _(" with customer name matching"
+                                        " '%(name)s'") % data
 
         if data['product_title']:
-            desc_ctx['title_filter'] = _(" including an item with title matching '%s'") % data['product_title']
+            desc_ctx['title_filter'] \
+                = _(" including an item with title matching"
+                    " '%(product_title)s'") % data
 
         if data['upc']:
-            desc_ctx['upc_filter'] = _(" including an item with UPC '%s'") % data['upc']
+            desc_ctx['upc_filter'] = _(" including an item with UPC"
+                                       " '%(upc)s'") % data
 
         if data['partner_sku']:
-            desc_ctx['upc_filter'] = _(" including an item with ID '%s'") % data['partner_sku']
+            desc_ctx['upc_filter'] = _(" including an item with ID"
+                                       " '%(partner_sku)s'") % data
 
         if data['date_from'] and data['date_to']:
-            desc_ctx['date_filter'] = _(" placed between %(start_date)s and %(end_date)s") % {
-                'start_date': format_datetime(data['date_from']),
-                'end_date': format_datetime(data['date_to'])}
+            desc_ctx['date_filter'] \
+                = _(" placed between %(start_date)s and %(end_date)s") \
+                % {'start_date': format_datetime(data['date_from']),
+                   'end_date': format_datetime(data['date_to'])}
         elif data['date_from']:
-            desc_ctx['date_filter'] = _(" placed since %s") % format_datetime(data['date_from'])
+            desc_ctx['date_filter'] = _(" placed since %s") \
+                % format_datetime(data['date_from'])
         elif data['date_to']:
             date_to = data['date_to'] + datetime.timedelta(days=1)
-            desc_ctx['date_filter'] = _(" placed before %s") % format_datetime(date_to)
+            desc_ctx['date_filter'] = _(" placed before %s") \
+                % format_datetime(date_to)
         if data['voucher']:
-            desc_ctx['voucher_filter'] = _(" using voucher '%s'") % data['voucher']
+            desc_ctx['voucher_filter'] = _(" using voucher '%(voucher)s'") \
+                % data
 
         if data['payment_method']:
-            desc_ctx['payment_filter'] = _(" paid for by %s") % data['payment_method']
+            desc_ctx['payment_filter'] = _(" paid for by %(payment_method)s") \
+                % data
 
         if data['status']:
-            desc_ctx['status_filter'] = _(" with status %s") % data['status']
+            desc_ctx['status_filter'] = _(" with status %(status)s") % data
 
         return desc_ctx
 
@@ -224,7 +236,8 @@ class OrderListView(BulkEditMixin, ListView):
                 number__istartswith=data['order_number'])
 
         if data['name']:
-            # If the value is two words, then assume they are first name and last name
+            # If the value is two words, then assume they are first name and
+            # last name
             parts = data['name'].split()
             allow_anon = getattr(settings, 'OSCAR_ALLOW_ANON_CHECKOUT', False)
 
@@ -233,18 +246,19 @@ class OrderListView(BulkEditMixin, ListView):
             else:
                 parts = [parts[0], parts[1:]]
 
-            filter = Q(user__first_name__istartswith=parts[0]) |\
-                     Q(user__last_name__istartswith=parts[1])
+            filter = Q(user__first_name__istartswith=parts[0])
+            filter |= Q(user__last_name__istartswith=parts[1])
             if allow_anon:
-                filter |= Q(billing_address__first_name__istartswith=parts[0]) |\
-                          Q(shipping_address__first_name__istartswith=parts[0]) |\
-                          Q(billing_address__last_name__istartswith=parts[1]) |\
-                          Q(shipping_address__last_name__istartswith=parts[1])
+                filter |= Q(billing_address__first_name__istartswith=parts[0])
+                filter |= Q(shipping_address__first_name__istartswith=parts[0])
+                filter |= Q(billing_address__last_name__istartswith=parts[1])
+                filter |= Q(shipping_address__last_name__istartswith=parts[1])
 
             queryset = queryset.filter(filter).distinct()
 
         if data['product_title']:
-            queryset = queryset.filter(lines__title__istartswith=data['product_title']).distinct()
+            queryset = queryset.filter(
+                lines__title__istartswith=data['product_title']).distinct()
 
         if data['upc']:
             queryset = queryset.filter(lines__upc=data['upc'])
@@ -255,7 +269,8 @@ class OrderListView(BulkEditMixin, ListView):
         if data['date_from'] and data['date_to']:
             # Add 24 hours to make search inclusive
             date_to = data['date_to'] + datetime.timedelta(days=1)
-            queryset = queryset.filter(date_placed__gte=data['date_from']).filter(date_placed__lt=date_to)
+            queryset = queryset.filter(date_placed__gte=data['date_from'])
+            queryset = queryset.filter(date_placed__lt=date_to)
         elif data['date_from']:
             queryset = queryset.filter(date_placed__gte=data['date_from'])
         elif data['date_to']:
@@ -263,10 +278,12 @@ class OrderListView(BulkEditMixin, ListView):
             queryset = queryset.filter(date_placed__lt=date_to)
 
         if data['voucher']:
-            queryset = queryset.filter(discounts__voucher_code=data['voucher']).distinct()
+            queryset = queryset.filter(
+                discounts__voucher_code=data['voucher']).distinct()
 
         if data['payment_method']:
-            queryset = queryset.filter(sources__source_type__code=data['payment_method']).distinct()
+            queryset = queryset.filter(
+                sources__source_type__code=data['payment_method']).distinct()
 
         if data['status']:
             queryset = queryset.filter(status=data['status'])
@@ -299,7 +316,8 @@ class OrderListView(BulkEditMixin, ListView):
 
     def download_selected_orders(self, request, orders):
         response = HttpResponse(content_type='text/csv')
-        response['Content-Disposition'] = 'attachment; filename=%s' % self.get_download_filename(request)
+        response['Content-Disposition'] = 'attachment; filename=%s' \
+            % self.get_download_filename(request)
         writer = CsvUnicodeWriter(response, delimiter=',')
 
         meta_data = (('number', _('Order number')),
@@ -333,7 +351,8 @@ class OrderListView(BulkEditMixin, ListView):
             else:
                 row['billing_address_name'] = ''
 
-            encoded_values = [unicode(value).encode('utf8') for value in row.values()]
+            encoded_values = [unicode(value).encode('utf8')
+                              for value in row.values()]
             writer.writerow(encoded_values)
         return response
 
@@ -408,15 +427,18 @@ class OrderDetailView(DetailView):
                     line_quantities.append(int(qty))
                 lines = order.lines.filter(id__in=line_ids)
                 if not lines.exists():
-                    messages.error(self.request, _("You must select some lines to act on"))
+                    messages.error(self.request,
+                                   _("You must select some lines to act on"))
                     return self.reload_page_response()
-                return getattr(self, line_action)(request, order, lines, line_quantities)
+                return getattr(self, line_action)(request, order, lines,
+                                                  line_quantities)
 
         messages.error(request, _("No valid action submitted"))
         return self.reload_page_response()
 
     def reload_page_response(self, fragment=None):
-        url = reverse('dashboard:order-detail', kwargs={'number': self.object.number})
+        url = reverse('dashboard:order-detail', kwargs={'number':
+                                                        self.object.number})
         if fragment:
             url += '#' + fragment
         return HttpResponseRedirect(url)
@@ -447,47 +469,51 @@ class OrderDetailView(DetailView):
     def change_order_status(self, request, order):
         new_status = request.POST['new_status'].strip()
         if not new_status:
-            messages.error(request, _("The new status '%s' is not valid") % new_status)
+            messages.error(request, _("The new status '%s' is not valid")
+                           % new_status)
             return self.reload_page_response()
         if not new_status in order.available_statuses():
-            messages.error(request, _("The new status '%s' is not valid for this order") % new_status)
+            messages.error(request, _("The new status '%s' is not valid for"
+                                      " this order") % new_status)
             return self.reload_page_response()
 
         handler = EventHandler(request.user)
         try:
             handler.handle_order_status_change(order, new_status)
         except PaymentError, e:
-            messages.error(request, _("Unable to change order status due to payment error: %s") % e)
+            messages.error(request, _("Unable to change order status due to"
+                                      " payment error: %s") % e)
         else:
-            msg = _("Order status changed from '%(old_status)s' to '%(new_status)s'") % {
-                'old_status': order.status,
-                'new_status': new_status}
+            msg = _("Order status changed from '%(old_status)s' to"
+                    " '%(new_status)s'") % {'old_status': order.status,
+                                            'new_status': new_status}
             messages.info(request, msg)
             order.notes.create(user=request.user, message=msg,
-                            note_type=OrderNote.SYSTEM)
+                               note_type=OrderNote.SYSTEM)
         return self.reload_page_response(fragment='activity')
 
     def change_line_statuses(self, request, order, lines, quantities):
         new_status = request.POST['new_status'].strip()
         if not new_status:
-            messages.error(request, _("The new status '%s' is not valid") % new_status)
+            messages.error(request, _("The new status '%s' is not valid")
+                           % new_status)
             return self.reload_page_response()
         errors = []
         for line in lines:
             if new_status not in line.available_statuses():
-                errors.append(_("'%(status)s' is not a valid new status for line %(line_id)d") % {
-                    'status': new_status,
-                    'line_id': line.id})
+                errors.append(_("'%(status)s' is not a valid new status for"
+                                " line %(line_id)d") % {'status': new_status,
+                                                        'line_id': line.id})
         if errors:
             messages.error(request, "\n".join(errors))
             return self.reload_page_response()
 
         msgs = []
         for line in lines:
-            msg = _("Status of line #%(line_id)d changed from '%(old_status)s' to '%(new_status)s'") % {
-                        'line_id': line.id,
-                        'old_status': line.status,
-                        'new_status': new_status}
+            msg = _("Status of line #%(line_id)d changed from '%(old_status)s'"
+                    " to '%(new_status)s'") % {'line_id': line.id,
+                                               'old_status': line.status,
+                                               'new_status': new_status}
             msgs.append(msg)
             line.set_status(new_status)
         message = "\n".join(msgs)
@@ -501,7 +527,8 @@ class OrderDetailView(DetailView):
         try:
             event_type = ShippingEventType._default_manager.get(code=code)
         except ShippingEventType.DoesNotExist:
-            messages.error(request, _("The event type '%s' is not valid") % code)
+            messages.error(request, _("The event type '%s' is not valid")
+                           % code)
             return self.reload_page_response()
 
         reference = request.POST.get('reference', None)
@@ -510,11 +537,14 @@ class OrderDetailView(DetailView):
                                                  quantities,
                                                  reference=reference)
         except InvalidShippingEvent, e:
-            messages.error(request, _("Unable to create shipping event: %s") % e)
+            messages.error(request,
+                           _("Unable to create shipping event: %s") % e)
         except InvalidStatus, e:
-            messages.error(request, _("Unable to create shipping event: %s") % e)
+            messages.error(request,
+                           _("Unable to create shipping event: %s") % e)
         except PaymentError, e:
-            messages.error(request, _("Unable to create shipping event due to payment error: %s") % e)
+            messages.error(request, _("Unable to create shipping event due to"
+                                      " payment error: %s") % e)
         else:
             messages.success(request, _("Shipping event created"))
         return self.reload_page_response()
@@ -534,13 +564,15 @@ class OrderDetailView(DetailView):
         try:
             event_type = PaymentEventType._default_manager.get(code=code)
         except PaymentEventType.DoesNotExist:
-            messages.error(request, _("The event type '%s' is not valid") % code)
+            messages.error(request, _("The event type '%s' is not valid")
+                           % code)
             return self.reload_page_response()
         try:
             EventHandler().handle_payment_event(order, event_type, amount,
                                                 lines, quantities)
         except PaymentError, e:
-            messages.error(request, _("Unable to change order status due to payment error: %s") % e)
+            messages.error(request, _("Unable to change order status due to"
+                                      " payment error: %s") % e)
         else:
             messages.info(request, _("Payment event created"))
         return self.reload_page_response()
@@ -595,11 +627,14 @@ def get_changes_between_models(model1, model2, excludes=None):
         excludes = []
     changes = {}
     for field in model1._meta.fields:
-        if not (isinstance(field, (fields.AutoField, fields.related.RelatedField))
+        if (isinstance(field, (fields.AutoField,
+                               fields.related.RelatedField))
                 or field.name in excludes):
-            if field.value_from_object(model1) != field.value_from_object(model2):
-                changes[field.verbose_name] = (field.value_from_object(model1),
-                                               field.value_from_object(model2))
+            continue
+
+        if field.value_from_object(model1) != field.value_from_object(model2):
+            changes[field.verbose_name] = (field.value_from_object(model1),
+                                           field.value_from_object(model2))
     return changes
 
 
@@ -610,10 +645,11 @@ def get_change_summary(model1, model2):
     changes = get_changes_between_models(model1, model2, ['search_text'])
     change_descriptions = []
     for field, delta in changes.items():
-        change_descriptions.append(_("%(field)s changed from '%(old_value)s' to '%(new_value)s'") % {
-            'field': field,
-            'old_value': delta[0],
-            'new_value': delta[1]})
+        change_descriptions.append(_("%(field)s changed from '%(old_value)s'"
+                                     " to '%(new_value)s'")
+                                   % {'field': field,
+                                      'old_value': delta[0],
+                                      'new_value': delta[1]})
     return "\n".join(change_descriptions)
 
 
@@ -644,9 +680,10 @@ class ShippingAddressUpdateView(UpdateView):
         if changes:
             msg = _("Delivery address updated:\n%s") % changes
             self.object.order.notes.create(user=self.request.user, message=msg,
-                                        note_type=OrderNote.SYSTEM)
+                                           note_type=OrderNote.SYSTEM)
         return response
 
     def get_success_url(self):
         messages.info(self.request, _("Delivery address updated"))
-        return reverse('dashboard:order-detail', kwargs={'number': self.object.order.number, })
+        return reverse('dashboard:order-detail',
+                       kwargs={'number': self.object.order.number, })

oscar/apps/dashboard/pages/app.py

@@ -17,15 +17,15 @@ class FlatPageManagementApplication(Application):
         """
         Get URL patterns defined for flatpage management application.
         """
-        urlpatterns = patterns('',
+        urls = [
             url(r'^$', self.list_view.as_view(), name='page-list'),
             url(r'^create/$', self.create_view.as_view(), name='page-create'),
             url(r'^update/(?P<pk>[-\w]+)/$',
                 self.update_view.as_view(), name='page-update'),
             url(r'^delete/(?P<pk>\d+)/$',
                 self.delete_view.as_view(), name='page-delete')
-        )
-        return self.post_process_urls(urlpatterns)
+        ]
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = FlatPageManagementApplication()

oscar/apps/dashboard/pages/views.py

@@ -49,7 +49,8 @@ class PageListView(ListView):
 
         if data['title']:
             queryset = queryset.filter(title__icontains=data['title'])
-            self.desc_ctx['title_filter'] = _(" with title containing '%s'") % data['title']
+            self.desc_ctx['title_filter'] \
+                = _(" with title containing '%s'") % data['title']
 
         return queryset
 

oscar/apps/dashboard/partners/app.py

@@ -20,7 +20,7 @@ class PartnersDashboardApplication(Application):
     user_update_view = views.PartnerUserUpdateView
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             url(r'^$', self.list_view.as_view(), name='partner-list'),
             url(r'^create/$', self.create_view.as_view(),
                 name='partner-create'),
@@ -42,8 +42,8 @@ class PartnersDashboardApplication(Application):
             url(r'^(?P<partner_pk>\d+)/users/(?P<user_pk>\d+)/update/$',
                 self.user_update_view.as_view(),
                 name='partner-user-update'),
-        )
-        return self.post_process_urls(urlpatterns)
+        ]
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = PartnersDashboardApplication()

oscar/apps/dashboard/partners/forms.py

@@ -4,7 +4,8 @@ from django.core import validators
 from django.db.models import get_model
 from django.utils.translation import ugettext_lazy as _
 
-from oscar.apps.customer.forms import EmailUserCreationForm, CommonPasswordValidator
+from oscar.apps.customer.forms import (EmailUserCreationForm,
+                                       CommonPasswordValidator)
 from oscar.core.compat import get_user_model
 
 User = get_user_model()

oscar/apps/dashboard/partners/views.py

@@ -9,7 +9,8 @@ from django.template.loader import render_to_string
 from django.views import generic
 
 from oscar.apps.customer.utils import normalise_email
-from oscar.apps.dashboard.partners.forms import UserEmailForm, ExistingUserForm, NewUserForm
+from oscar.apps.dashboard.partners.forms import (UserEmailForm,
+                                                 ExistingUserForm, NewUserForm)
 from oscar.core.loading import get_classes
 from oscar.core.compat import get_user_model
 from oscar.views import sort_queryset
@@ -237,13 +238,14 @@ class PartnerUserLinkView(generic.View):
         partner = get_object_or_404(Partner, pk=partner_pk)
         if self.link_user(user, partner):
             messages.success(
-                request, _("User '%(name)s' was linked to '%(partner_name)s'") %
-                         {'name': name, 'partner_name': partner.name})
+                request,
+                _("User '%(name)s' was linked to '%(partner_name)s'")
+                % {'name': name, 'partner_name': partner.name})
         else:
             messages.info(
                 request,
-                _("User '%(name)s' is already linked to '%(partner_name)s'") %
-                    {'name': name, 'partner_name': partner.name})
+                _("User '%(name)s' is already linked to '%(partner_name)s'")
+                % {'name': name, 'partner_name': partner.name})
         return HttpResponseRedirect(reverse('dashboard:partner-manage',
                                             kwargs={'pk': partner_pk}))
 
@@ -255,7 +257,8 @@ class PartnerUserUnlinkView(generic.View):
         Unlinks a user from a partner, and removes the dashboard permission
         if she's not linked to any other partners.
 
-        Returns False if the user was not linked to the partner; True otherwise.
+        Returns False if the user was not linked to the partner; True
+        otherwise.
         """
         if not partner.users.filter(pk=user.pk).exists():
             return False
@@ -282,7 +285,7 @@ class PartnerUserUnlinkView(generic.View):
             messages.error(
                 request,
                 _("User '%(name)s' is not linked to '%(partner_name)s'") %
-                    {'name': name, 'partner_name': partner.name})
+                {'name': name, 'partner_name': partner.name})
         return HttpResponseRedirect(reverse('dashboard:partner-manage',
                                             kwargs={'pk': partner_pk}))
 

oscar/apps/dashboard/promotions/app.py

@@ -16,15 +16,15 @@ class PromotionsDashboardApplication(Application):
     delete_page_promotion_view = views.DeletePagePromotionView
 
     for klass in PROMOTION_CLASSES:
-        locals()['create_%s_view' % klass.classname()] = \
-                getattr(views, 'Create%sView' % klass.__name__)
-        locals()['update_%s_view' % klass.classname()] = \
-                getattr(views, 'Update%sView' % klass.__name__)
-        locals()['delete_%s_view' % klass.classname()] = \
-                getattr(views, 'Delete%sView' % klass.__name__)
+        locals()['create_%s_view' % klass.classname()] \
+            = getattr(views, 'Create%sView' % klass.__name__)
+        locals()['update_%s_view' % klass.classname()] \
+            = getattr(views, 'Update%sView' % klass.__name__)
+        locals()['delete_%s_view' % klass.classname()] \
+            = getattr(views, 'Delete%sView' % klass.__name__)
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             url(r'^$', self.list_view.as_view(), name='promotion-list'),
             url(r'^pages/$', self.page_list.as_view(),
                 name='promotion-list-by-page'),
@@ -35,11 +35,11 @@ class PromotionsDashboardApplication(Application):
                 name='promotion-create-redirect'),
             url(r'^page-promotion/(?P<pk>\d+)/$',
                 self.delete_page_promotion_view.as_view(),
-                name='pagepromotion-delete'))
+                name='pagepromotion-delete')]
 
         for klass in PROMOTION_CLASSES:
             code = klass.classname()
-            urlpatterns += patterns('',
+            urls += [
                 url(r'create/%s/' % code,
                     getattr(self, 'create_%s_view' % code).as_view(),
                     name='promotion-create-%s' % code),
@@ -48,9 +48,9 @@ class PromotionsDashboardApplication(Application):
                     name='promotion-update'),
                 url(r'^delete/(?P<ptype>%s)/(?P<pk>\d+)/$' % code,
                     getattr(self, 'delete_%s_view' % code).as_view(),
-                    name='promotion-delete'))
+                    name='promotion-delete')]
 
-        return self.post_process_urls(urlpatterns)
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = PromotionsDashboardApplication()

oscar/apps/dashboard/promotions/forms.py

@@ -7,10 +7,10 @@ from oscar.apps.promotions.conf import PROMOTION_CLASSES
 from oscar.forms.fields import ExtendedURLField
 from oscar.core.loading import get_classes, get_class
 
-HandPickedProductList, RawHTML, SingleProduct, PagePromotion, OrderedProduct = get_classes(
-    'promotions.models',
-    ['HandPickedProductList', 'RawHTML', 'SingleProduct', 'PagePromotion',
-     'OrderedProduct'])
+HandPickedProductList, RawHTML, SingleProduct, PagePromotion, OrderedProduct \
+    = get_classes('promotions.models',
+                  ['HandPickedProductList', 'RawHTML', 'SingleProduct',
+                   'PagePromotion', 'OrderedProduct'])
 ProductSelect = get_class('dashboard.catalogue.widgets', 'ProductSelect')
 
 
@@ -31,9 +31,7 @@ class RawHTMLForm(forms.ModelForm):
 class SingleProductForm(forms.ModelForm):
     class Meta:
         model = SingleProduct
-        widgets = {
-            'product': ProductSelect,
-            }
+        widgets = {'product': ProductSelect}
 
 
 class HandPickedProductListForm(forms.ModelForm):
@@ -78,5 +76,3 @@ class PagePromotionForm(forms.ModelForm):
             page_url += '/'
 
         return page_url
-
-

oscar/apps/dashboard/promotions/views.py

@@ -13,16 +13,18 @@ from django.shortcuts import HttpResponse
 from oscar.core.loading import get_classes
 from oscar.apps.promotions.conf import PROMOTION_CLASSES
 
-SingleProduct, RawHTML, Image, MultiImage, \
-    AutomaticProductList, PagePromotion, \
-    HandPickedProductList = get_classes('promotions.models',
-    ['SingleProduct', 'RawHTML', 'Image', 'MultiImage', 'AutomaticProductList',
-     'PagePromotion', 'HandPickedProductList'])
+SingleProduct, RawHTML, Image, MultiImage, AutomaticProductList, \
+    PagePromotion, HandPickedProductList \
+    = get_classes('promotions.models',
+                  ['SingleProduct', 'RawHTML', 'Image', 'MultiImage',
+                   'AutomaticProductList', 'PagePromotion',
+                   'HandPickedProductList'])
 SelectForm, RawHTMLForm, PagePromotionForm, HandPickedProductListForm, \
-    SingleProductForm, OrderedProductFormSet = get_classes(
-    'dashboard.promotions.forms',
-    ['PromotionTypeSelectForm', 'RawHTMLForm', 'PagePromotionForm',
-     'HandPickedProductListForm', 'SingleProductForm', 'OrderedProductFormSet'])
+    SingleProductForm, OrderedProductFormSet \
+    = get_classes('dashboard.promotions.forms',
+                  ['PromotionTypeSelectForm', 'RawHTMLForm',
+                   'PagePromotionForm', 'HandPickedProductListForm',
+                   'SingleProductForm', 'OrderedProductFormSet'])
 
 
 class ListView(generic.TemplateView):
@@ -80,12 +82,11 @@ class PageDetailView(generic.TemplateView):
         for code, name in settings.OSCAR_PROMOTION_POSITIONS:
             promotions = PagePromotion._default_manager.select_related() \
                                                        .filter(page_url=path,
-                                                               position=code) \
-                                                       .order_by('display_order')
+                                                               position=code)
             ctx.append({
                 'code': code,
                 'name': name,
-                'promotions': promotions,
+                'promotions': promotions.order_by('display_order'),
             })
         return ctx
 
@@ -181,7 +182,8 @@ class CreateHandPickedProductListView(CreateView):
         ctx = super(CreateHandPickedProductListView,
                     self).get_context_data(**kwargs)
         if 'product_formset' not in kwargs:
-            ctx['product_formset'] = OrderedProductFormSet(instance=self.object)
+            ctx['product_formset'] \
+                = OrderedProductFormSet(instance=self.object)
         return ctx
 
     def form_valid(self, form):
@@ -192,7 +194,8 @@ class CreateHandPickedProductListView(CreateView):
             promotion.save()
             product_formset.save()
             self.object = promotion
-            messages.success(self.request, _('Product list content block created'))
+            messages.success(self.request,
+                             _('Product list content block created'))
             return HttpResponseRedirect(self.get_success_url())
 
         ctx = self.get_context_data(product_formset=product_formset)
@@ -235,10 +238,12 @@ class UpdateView(PromotionMixin, generic.UpdateView):
         if form.is_valid():
             form.save()
             page_url = form.cleaned_data['page_url']
-            messages.success(request, _("Content block '%(block)s' added to page '%(page)s'") % {
-                'block': promotion.name,
-                'page': page_url})
-            return HttpResponseRedirect(reverse('dashboard:promotion-update', kwargs=kwargs))
+            messages.success(request, _("Content block '%(block)s' added to"
+                                        " page '%(page)s'")
+                             % {'block': promotion.name,
+                                'page': page_url})
+            return HttpResponseRedirect(reverse('dashboard:promotion-update',
+                                                kwargs=kwargs))
 
         main_form = self.get_form_class()(instance=self.object)
         ctx = self.get_context_data(form=main_form)
@@ -254,8 +259,10 @@ class UpdateView(PromotionMixin, generic.UpdateView):
         else:
             page_url = link.page_url
             link.delete()
-            messages.success(request, _("Content block removed from page '%s'") % page_url)
-        return HttpResponseRedirect(reverse('dashboard:promotion-update', kwargs=kwargs))
+            messages.success(request, _("Content block removed from page '%s'")
+                             % page_url)
+        return HttpResponseRedirect(reverse('dashboard:promotion-update',
+                                            kwargs=kwargs))
 
 
 class UpdateRawHTMLView(UpdateView):
@@ -288,7 +295,8 @@ class UpdateHandPickedProductListView(UpdateView):
         ctx = super(UpdateHandPickedProductListView,
                     self).get_context_data(**kwargs)
         if 'product_formset' not in kwargs:
-            ctx['product_formset'] = OrderedProductFormSet(instance=self.object)
+            ctx['product_formset'] \
+                = OrderedProductFormSet(instance=self.object)
         return ctx
 
     def form_valid(self, form):

oscar/apps/dashboard/ranges/forms.py

@@ -52,15 +52,16 @@ class RangeProductForm(forms.Form):
 
         if len(new_ids) == 0:
             raise forms.ValidationError(
-                _("The products with SKUs or UPCs matching %s are already in this range") % (
-                    ', '.join(ids)))
+                _("The products with SKUs or UPCs matching %s are already in"
+                  " this range") % (', '.join(ids)))
 
         self.products = Product._default_manager.filter(
             Q(stockrecords__partner_sku__in=new_ids) |
             Q(upc__in=new_ids))
         if len(self.products) == 0:
             raise forms.ValidationError(
-                _("No products exist with a SKU or UPC matching %s") % ", ".join(ids))
+                _("No products exist with a SKU or UPC matching %s")
+                % ", ".join(ids))
 
         found_skus = set(self.products.values_list(
             'stockrecords__partner_sku', flat=True))

oscar/apps/dashboard/ranges/models.py

@@ -9,10 +9,12 @@ Product = models.get_model('catalogue', 'Product')
 
 
 class RangeProductFileUpload(models.Model):
-    range = models.ForeignKey('offer.Range', related_name='file_uploads', verbose_name=_("Range"))
+    range = models.ForeignKey('offer.Range', related_name='file_uploads',
+                              verbose_name=_("Range"))
     filepath = models.CharField(_("File Path"), max_length=255)
     size = models.PositiveIntegerField(_("Size"))
-    uploaded_by = models.ForeignKey(AUTH_USER_MODEL, verbose_name=_("Uploaded By"))
+    uploaded_by = models.ForeignKey(AUTH_USER_MODEL,
+                                    verbose_name=_("Uploaded By"))
     date_uploaded = models.DateTimeField(_("Date Uploaded"), auto_now_add=True)
 
     PENDING, FAILED, PROCESSED = 'Pending', 'Failed', 'Processed'
@@ -21,14 +23,19 @@ class RangeProductFileUpload(models.Model):
         (FAILED, FAILED),
         (PROCESSED, PROCESSED),
     )
-    status = models.CharField(_("Status"), max_length=32, choices=choices, default=PENDING)
-    error_message = models.CharField(_("Error Message"), max_length=255, blank=True)
+    status = models.CharField(_("Status"), max_length=32, choices=choices,
+                              default=PENDING)
+    error_message = models.CharField(_("Error Message"), max_length=255,
+                                     blank=True)
 
     # Post-processing audit fields
     date_processed = models.DateTimeField(_("Date Processed"), null=True)
-    num_new_skus = models.PositiveIntegerField(_("Number of New SKUs"), null=True)
-    num_unknown_skus = models.PositiveIntegerField(_("Number of Unknown SKUs"), null=True)
-    num_duplicate_skus = models.PositiveIntegerField(_("Number of Duplicate SKUs"), null=True)
+    num_new_skus = models.PositiveIntegerField(_("Number of New SKUs"),
+                                               null=True)
+    num_unknown_skus = models.PositiveIntegerField(_("Number of Unknown SKUs"),
+                                                   null=True)
+    num_duplicate_skus = models.PositiveIntegerField(
+        _("Number of Duplicate SKUs"), null=True)
 
     class Meta:
         ordering = ('-date_uploaded',)
@@ -62,8 +69,11 @@ class RangeProductFileUpload(models.Model):
         """
         all_ids = set(self.extract_ids())
         products = self.range.included_products.all()
-        existing_skus = set(filter(bool, products.values_list('stockrecord__partner_sku', flat=True)))
-        existing_upcs = set(filter(bool, products.values_list('upc', flat=True)))
+        existing_skus = products.values_list('stockrecord__partner_sku',
+                                             flat=True)
+        existing_skus = set(filter(bool, existing_skus))
+        existing_upcs = products.values_list('upc', flat=True)
+        existing_upcs = set(filter(bool, existing_upcs))
         existing_ids = existing_skus.union(existing_upcs)
         new_ids = all_ids - existing_ids
 
@@ -74,7 +84,9 @@ class RangeProductFileUpload(models.Model):
             self.range.add_product(product)
 
         # Processing stats
-        found_skus = set(filter(bool, products.values_list('stockrecord__partner_sku', flat=True)))
+        found_skus = products.values_list('stockrecord__partner_sku',
+                                          flat=True)
+        found_skus = set(filter(bool, found_skus))
         found_upcs = set(filter(bool, products.values_list('upc', flat=True)))
         found_ids = found_skus.union(found_upcs)
         missing_ids = new_ids - found_ids

oscar/apps/dashboard/reports/app.py

@@ -11,10 +11,10 @@ class ReportsApplication(Application):
     index_view = views.IndexView
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             url(r'^$', self.index_view.as_view(), name='reports-index'),
-        )
-        return self.post_process_urls(urlpatterns)
+        ]
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = ReportsApplication()

oscar/apps/dashboard/reports/forms.py

@@ -2,7 +2,8 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 
 from oscar.core.loading import get_class
-GeneratorRepository = get_class('dashboard.reports.utils', 'GeneratorRepository')
+GeneratorRepository = get_class('dashboard.reports.utils',
+                                'GeneratorRepository')
 
 
 class ReportForm(forms.Form):
@@ -11,16 +12,23 @@ class ReportForm(forms.Form):
     type_choices = []
     for generator in generators:
         type_choices.append((generator.code, generator.description))
-    report_type = forms.ChoiceField(widget=forms.Select(), choices=type_choices, label=_("Report Type"),
-                                    help_text=_("Only the offer and order reports "
-                                                "use the selected date range"))
+    report_type = forms.ChoiceField(widget=forms.Select(),
+                                    choices=type_choices,
+                                    label=_("Report Type"),
+                                    help_text=_("Only the offer and order"
+                                                " reports use the selected"
+                                                " date range"))
 
     date_from = forms.DateField(label=_("Date from"))
     date_to = forms.DateField(label=_("Date to"),
-                              help_text=_("The report is inclusive of this date"))
+                              help_text=_("The report is inclusive of this"
+                                          " date"))
     download = forms.BooleanField(label=_("Download"), required=False)
 
     def clean(self):
-        if 'date_from' in self.cleaned_data and 'date_to' in self.cleaned_data and self.cleaned_data['date_from'] > self.cleaned_data['date_to']:
-            raise forms.ValidationError(_("Your start date must be before your end date"))
+        if ('date_from' in self.cleaned_data and 'date_to' in self.cleaned_data
+                and self.cleaned_data['date_from'] >
+                self.cleaned_data['date_to']):
+            raise forms.ValidationError(_("Your start date must be before your"
+                                          " end date"))
         return self.cleaned_data

oscar/apps/dashboard/reports/models.py

@@ -1,2 +0,0 @@
-# Put your models here
-

oscar/apps/dashboard/reports/reports.py

@@ -20,14 +20,15 @@ class ReportGenerator(object):
             self.start_date = kwargs['start_date']
             self.end_date = kwargs['end_date']
 
-        self.formatter = self.formatters['%s_formatter' % kwargs['formatter']]()
+        formatter_name = '%s_formatter' % kwargs['formatter']
+        self.formatter = self.formatters[formatter_name]()
 
     def report_description(self):
-        return _('%(report_filter)s between %(start_date)s and %(end_date)s') % {
-            'report_filter': self.description,
-            'start_date': self.start_date,
-            'end_date': self.end_date,
-        }
+        return _('%(report_filter)s between %(start_date)s and %(end_date)s') \
+            % {'report_filter': self.description,
+               'start_date': self.start_date,
+               'end_date': self.end_date,
+               }
 
     def generate(self, response):
         pass
@@ -67,7 +68,8 @@ class ReportCSVFormatter(ReportFormatter):
 
     def generate_response(self, objects, **kwargs):
         response = HttpResponse(content_type='text/csv')
-        response['Content-Disposition'] = 'attachment; filename=%s' % self.filename(**kwargs)
+        response['Content-Disposition'] = 'attachment; filename=%s' \
+            % self.filename(**kwargs)
         self.generate_csv(response, objects)
         return response
 

oscar/apps/dashboard/reports/utils.py

@@ -1,8 +1,11 @@
 from oscar.core.loading import get_class, get_classes
 OrderReportGenerator = get_class('order.reports', 'OrderReportGenerator')
-ProductReportGenerator, UserReportGenerator = get_classes('analytics.reports', ['ProductReportGenerator', 'UserReportGenerator'])
-OpenBasketReportGenerator, SubmittedBasketReportGenerator = get_classes(
-    'basket.reports', ['OpenBasketReportGenerator', 'SubmittedBasketReportGenerator'])
+ProductReportGenerator, UserReportGenerator \
+    = get_classes('analytics.reports', ['ProductReportGenerator',
+                                        'UserReportGenerator'])
+OpenBasketReportGenerator, SubmittedBasketReportGenerator \
+    = get_classes('basket.reports', ['OpenBasketReportGenerator',
+                                     'SubmittedBasketReportGenerator'])
 OfferReportGenerator = get_class('offer.reports', 'OfferReportGenerator')
 VoucherReportGenerator = get_class('voucher.reports', 'VoucherReportGenerator')
 
@@ -25,5 +28,3 @@ class GeneratorRepository(object):
             if generator.code == code:
                 return generator
         return None
-
-

oscar/apps/dashboard/reports/views.py

@@ -5,7 +5,9 @@ from django.utils.translation import ugettext_lazy as _
 
 from oscar.core.loading import get_class
 ReportForm = get_class('dashboard.reports.forms', 'ReportForm')
-GeneratorRepository = get_class('dashboard.reports.utils', 'GeneratorRepository')
+GeneratorRepository = get_class('dashboard.reports.utils',
+                                'GeneratorRepository')
+
 
 class IndexView(ListView):
     template_name = 'dashboard/reports/index.html'
@@ -35,7 +37,8 @@ class IndexView(ListView):
             if form.is_valid():
                 generator = self._get_generator(form)
                 if not generator.is_available_to(request.user):
-                    return HttpResponseForbidden(_("You do not have access to this report"))
+                    return HttpResponseForbidden(_("You do not have access to"
+                                                   " this report"))
 
                 report = generator.generate()
 
@@ -54,5 +57,3 @@ class IndexView(ListView):
     def set_list_view_attrs(self, generator, report):
         self.template_name = generator.filename()
         self.object_list = self.queryset = report
-
-

oscar/apps/dashboard/reviews/app.py

@@ -13,16 +13,14 @@ class ReviewsApplication(Application):
     delete_view = views.ReviewDeleteView
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             url(r'^$', self.list_view.as_view(), name='reviews-list'),
             url(r'^(?P<pk>\d+)/$', self.update_view.as_view(),
-                name='reviews-update'
-            ),
+                name='reviews-update'),
             url(r'^(?P<pk>\d+)/delete/$', self.delete_view.as_view(),
-                name='reviews-delete'
-            ),
-        )
-        return self.post_process_urls(urlpatterns)
+                name='reviews-delete'),
+        ]
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = ReviewsApplication()

oscar/apps/dashboard/reviews/forms.py

@@ -6,7 +6,7 @@ ProductReview = get_model('reviews', 'productreview')
 
 
 class DashboardProductReviewForm(forms.ModelForm):
-    choices= (
+    choices = (
         (ProductReview.APPROVED, _('Approved')),
         (ProductReview.REJECTED, _('Rejected')),
     )

oscar/apps/dashboard/reviews/utils.py

@@ -1,29 +1,30 @@
 from oscar.core.loading import get_class, get_classes
 OrderReportGenerator = get_class('order.reports', 'OrderReportGenerator')
-ProductReportGenerator, UserReportGenerator = get_classes('analytics.reports', ['ProductReportGenerator', 'UserReportGenerator'])
-OpenBasketReportGenerator, SubmittedBasketReportGenerator = get_classes(
-    'basket.reports', ['OpenBasketReportGenerator', 'SubmittedBasketReportGenerator'])     
+ProductReportGenerator, UserReportGenerator \
+    = get_classes('analytics.reports', ['ProductReportGenerator',
+                                        'UserReportGenerator'])
+OpenBasketReportGenerator, SubmittedBasketReportGenerator \
+    = get_classes('basket.reports', ['OpenBasketReportGenerator',
+                                     'SubmittedBasketReportGenerator'])
 OfferReportGenerator = get_class('offer.reports', 'OfferReportGenerator')
 VoucherReportGenerator = get_class('voucher.reports', 'VoucherReportGenerator')
 
 
 class GeneratorRepository(object):
-    
+
     generators = [OrderReportGenerator,
                   ProductReportGenerator,
                   UserReportGenerator,
                   OpenBasketReportGenerator,
                   SubmittedBasketReportGenerator,
-                  VoucherReportGenerator, 
+                  VoucherReportGenerator,
                   OfferReportGenerator]
 
     def get_report_generators(self):
         return self.generators
-    
+
     def get_generator(self, code):
         for generator in self.generators:
             if generator.code == code:
                 return generator
         return None
-    
-    

oscar/apps/dashboard/reviews/views.py

@@ -52,24 +52,28 @@ class ReviewListView(BulkEditMixin, generic.ListView):
             ).filter(
                 date_created__lt=date_to
             )
-            self.desc_ctx['date_filter'] = _(" created between %(start_date)s and %(end_date)s") % {
-                'start_date': format_datetime(date_from),
-                'end_date': format_datetime(date_to)
-            }
+            self.desc_ctx['date_filter'] \
+                = _(" created between %(start_date)s and %(end_date)s") % {
+                    'start_date': format_datetime(date_from),
+                    'end_date': format_datetime(date_to)
+                }
         elif date_from:
             queryset = queryset.filter(date_created__gte=date_from)
-            self.desc_ctx['date_filter'] =  _(" created after %s") % format_datetime(date_from)
+            self.desc_ctx['date_filter'] \
+                = _(" created after %s") % format_datetime(date_from)
         elif date_to:
             # Add 24 hours to make search inclusive
             date_to = date_to + datetime.timedelta(days=1)
             queryset = queryset.filter(date_created__lt=date_to)
-            self.desc_ctx['date_filter'] = _(" created before %s") % format_datetime(date_to)
+            self.desc_ctx['date_filter'] \
+                = _(" created before %s") % format_datetime(date_to)
 
         return queryset
 
     def get_queryset(self):
         queryset = self.model.objects.all()
-        queryset = sort_queryset(queryset, self.request, ['score', 'total_votes', 'date_created'])
+        queryset = sort_queryset(queryset, self.request,
+                                 ['score', 'total_votes', 'date_created'])
         self.desc_ctx = {
             'main_filter': _('All reviews'),
             'date_filter': '',
@@ -90,14 +94,16 @@ class ReviewListView(BulkEditMixin, generic.ListView):
         if data['status'] != '':
             queryset = queryset.filter(status=data['status']).distinct()
             display_status = self.form.get_friendly_status()
-            self.desc_ctx['status_filter'] = _(" with status matching '%s'") % display_status
+            self.desc_ctx['status_filter'] \
+                = _(" with status matching '%s'") % display_status
 
         if data['keyword']:
             queryset = queryset.filter(
                 Q(title__icontains=data['keyword']) |
                 Q(body__icontains=data['keyword'])
             ).distinct()
-            self.desc_ctx['kw_filter'] = _(" with keyword matching '%s'") % data['keyword']
+            self.desc_ctx['kw_filter'] \
+                = _(" with keyword matching '%s'") % data['keyword']
 
         queryset = self.get_date_from_to_queryset(data['date_from'],
                                                   data['date_to'], queryset)
@@ -116,7 +122,8 @@ class ReviewListView(BulkEditMixin, generic.ListView):
                     Q(user__first_name__istartswith=parts[0]) |
                     Q(user__last_name__istartswith=parts[-1])
                 ).distinct()
-            self.desc_ctx['name_filter'] = _(" with customer name matching '%s'") % data['name']
+            self.desc_ctx['name_filter'] \
+                = _(" with customer name matching '%s'") % data['name']
 
         return queryset
 

oscar/apps/dashboard/users/app.py

@@ -16,7 +16,7 @@ class UserManagementApplication(Application):
     alert_delete_view = views.ProductAlertDeleteView
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             url(r'^$', self.index_view.as_view(), name='users-index'),
             url(r'^(?P<pk>\d+)/$',
                 self.user_detail_view.as_view(), name='user-detail'),
@@ -34,8 +34,8 @@ class UserManagementApplication(Application):
             url(r'^alerts/(?P<pk>\d+)/update/$',
                 self.alert_update_view.as_view(),
                 name='user-alert-update'),
-        )
-        return self.post_process_urls(urlpatterns)
+        ]
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = UserManagementApplication()

oscar/apps/dashboard/users/views.py

@@ -53,17 +53,21 @@ class IndexView(BulkEditMixin, ListView):
         if data['email']:
             email = normalise_email(data['email'])
             queryset = queryset.filter(email__startswith=email)
-            self.desc_ctx['email_filter'] = _(" with email matching '%s'") % email
+            self.desc_ctx['email_filter'] \
+                = _(" with email matching '%s'") % email
         if data['name']:
-            # If the value is two words, then assume they are first name and last name
+            # If the value is two words, then assume they are first name and
+            # last name
             parts = data['name'].split()
             if len(parts) == 2:
-                queryset = queryset.filter(Q(first_name__istartswith=parts[0]) |
-                                           Q(last_name__istartswith=parts[1])).distinct()
+                condition = Q(first_name__istartswith=parts[0]) \
+                    | Q(last_name__istartswith=parts[1])
             else:
-                queryset = queryset.filter(Q(first_name__istartswith=data['name']) |
-                                           Q(last_name__istartswith=data['name'])).distinct()
-            self.desc_ctx['name_filter'] = _(" with name matching '%s'") % data['name']
+                condition = Q(first_name__istartswith=data['name']) \
+                    | Q(last_name__istartswith=data['name'])
+            queryset = queryset.filter(condition).distinct()
+            self.desc_ctx['name_filter'] \
+                = _(" with name matching '%s'") % data['name']
 
         return queryset
 
@@ -119,7 +123,6 @@ class PasswordResetView(FormView):
         )
 
 
-
 class ProductAlertListView(ListView):
     model = ProductAlert
     form_class = ProductAlertSearchForm
@@ -141,7 +144,8 @@ class ProductAlertListView(ListView):
 
         if data['status']:
             queryset = queryset.filter(status=data['status']).distinct()
-            self.description += _(" with status matching '%s'") % data['status']
+            self.description \
+                += _(" with status matching '%s'") % data['status']
 
         if data['name']:
             # If the value is two words, then assume they are first name and
@@ -157,14 +161,16 @@ class ProductAlertListView(ListView):
                     Q(user__first_name__istartswith=parts[0]) |
                     Q(user__last_name__istartswith=parts[-1])
                 ).distinct()
-            self.description += _(" with customer name matching '%s'") % data['name']
+            self.description \
+                += _(" with customer name matching '%s'") % data['name']
 
         if data['email']:
             queryset = queryset.filter(
                 Q(user__email__icontains=data['email']) |
                 Q(email__icontains=data['email'])
             )
-            self.description += _(" with customer email matching '%s'") % data['email']
+            self.description \
+                += _(" with customer email matching '%s'") % data['email']
 
         return queryset
 

oscar/apps/dashboard/views.py

@@ -45,8 +45,9 @@ class IndexView(TemplateView):
         ``Queryset`` of site offers is filtered by end date greater then
         the current date.
         """
-        return ConditionalOffer.objects.filter(end_datetime__gt=now(),
-                                               offer_type=ConditionalOffer.SITE)
+        return ConditionalOffer.objects\
+            .filter(end_datetime__gt=now(),
+                    offer_type=ConditionalOffer.SITE)
 
     def get_active_vouchers(self):
         """
@@ -92,7 +93,7 @@ class IndexView(TemplateView):
         """
         # Get datetime for 24 hours agao
         time_now = now().replace(minute=0, second=0)
-        start_time = time_now - timedelta(hours=hours-1)
+        start_time = time_now - timedelta(hours=hours - 1)
 
         orders_last_day = Order.objects.filter(date_placed__gt=start_time)
 
@@ -123,7 +124,7 @@ class IndexView(TemplateView):
 
             y_range = []
             y_axis_steps = max_value / D(str(segments))
-            for idx in reversed(range(segments+1)):
+            for idx in reversed(range(segments + 1)):
                 y_range.append(idx * y_axis_steps)
         else:
             y_range = []
@@ -146,9 +147,11 @@ class IndexView(TemplateView):
         open_alerts = StockAlert.objects.filter(status=StockAlert.OPEN)
         closed_alerts = StockAlert.objects.filter(status=StockAlert.CLOSED)
 
+        total_lines_last_day = Line.objects.filter(order__in=orders_last_day)\
+            .count(),
         stats = {
             'total_orders_last_day': orders_last_day.count(),
-            'total_lines_last_day': Line.objects.filter(order__in=orders_last_day).count(),
+            'total_lines_last_day': total_lines_last_day,
 
             'average_order_costs': orders_last_day.aggregate(
                 Avg('total_incl_tax')

oscar/apps/dashboard/vouchers/app.py

@@ -15,7 +15,7 @@ class VoucherDashboardApplication(Application):
     stats_view = views.VoucherStatsView
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             url(r'^$', self.list_view.as_view(), name='voucher-list'),
             url(r'^create/$', self.create_view.as_view(),
                 name='voucher-create'),
@@ -25,8 +25,8 @@ class VoucherDashboardApplication(Application):
                 name='voucher-delete'),
             url(r'^stats/(?P<pk>\d+)/$', self.stats_view.as_view(),
                 name='voucher-stats'),
-        )
-        return self.post_process_urls(urlpatterns)
+        ]
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = VoucherDashboardApplication()

oscar/apps/dashboard/vouchers/forms.py

@@ -50,7 +50,8 @@ class VoucherForm(forms.Form):
             pass
         else:
             if (not self.voucher) or (voucher.id != self.voucher.id):
-                raise forms.ValidationError(_("The name '%s' is already in use") % name)
+                raise forms.ValidationError(_("The name '%s' is already in"
+                                              " use") % name)
         return name
 
     def clean_code(self):
@@ -63,7 +64,8 @@ class VoucherForm(forms.Form):
             pass
         else:
             if (not self.voucher) or (voucher.id != self.voucher.id):
-                raise forms.ValidationError(_("The code '%s' is already in use") % code)
+                raise forms.ValidationError(_("The code '%s' is already in"
+                                              " use") % code)
         return code
 
     def clean(self):
@@ -71,7 +73,8 @@ class VoucherForm(forms.Form):
         start_date = cleaned_data.get('start_date', None)
         end_date = cleaned_data.get('end_date', None)
         if start_date and end_date and end_date < start_date:
-            raise forms.ValidationError(_("The start date must be before the end date"))
+            raise forms.ValidationError(_("The start date must be before the"
+                                          " end date"))
         return cleaned_data
 
 

oscar/apps/dashboard/vouchers/views.py

@@ -29,8 +29,9 @@ class VoucherListView(ListView):
     def get_queryset(self):
         qs = self.model.objects.all().order_by('-date_created')
         qs = sort_queryset(qs, self.request,
-            ['num_basket_additions', 'num_orders', 'date_created'],
-            '-date_created')
+                           ['num_basket_additions', 'num_orders',
+                            'date_created'],
+                           '-date_created')
         self.description_ctx = {'main_filter': _('All vouchers'),
                                 'name_filter': '',
                                 'code_filter': ''}
@@ -47,10 +48,12 @@ class VoucherListView(ListView):
         data = self.form.cleaned_data
         if data['name']:
             qs = qs.filter(name__icontains=data['name'])
-            self.description_ctx['name_filter'] = _("with name matching '%s'") % data['name']
+            self.description_ctx['name_filter'] \
+                = _("with name matching '%s'") % data['name']
         if data['code']:
             qs = qs.filter(code=data['code'])
-            self.description_ctx['code_filter'] = _("with code '%s'") % data['code']
+            self.description_ctx['code_filter'] \
+                = _("with code '%s'") % data['code']
         if data['is_active']:
             today = datetime.date.today()
             qs = qs.filter(start_date__lte=today, end_date__gte=today)
@@ -116,7 +119,9 @@ class VoucherStatsView(DetailView):
 
     def get_context_data(self, **kwargs):
         ctx = super(VoucherStatsView, self).get_context_data(**kwargs)
-        ctx['discounts'] = OrderDiscount.objects.filter(voucher_id=self.object.id).order_by('-order__date_placed')
+        discounts = OrderDiscount.objects.filter(voucher_id=self.object.id)
+        discounts = discounts.order_by('-order__date_placed')
+        ctx['discounts'] = discounts
         return ctx
 
 

oscar/apps/offer/admin.py

@@ -16,7 +16,8 @@ class BenefitAdmin(admin.ModelAdmin):
 
 
 class ConditionalOfferAdmin(admin.ModelAdmin):
-    list_display = ('name', 'offer_type', 'start_datetime', 'end_datetime', 'condition', 'benefit', 'total_discount')
+    list_display = ('name', 'offer_type', 'start_datetime', 'end_datetime',
+                    'condition', 'benefit', 'total_discount')
     list_filter = ('offer_type',)
     readonly_fields = ('total_discount', 'num_orders')
     fieldsets = (

oscar/apps/offer/app.py

@@ -10,11 +10,12 @@ class OfferApplication(Application):
     list_view = views.OfferListView
 
     def get_urls(self):
-        urlpatterns = patterns('',
+        urls = [
             url(r'^$', self.list_view.as_view(), name='list'),
-            url(r'^(?P<slug>[\w-]+)/$', self.detail_view.as_view(), name='detail'),
-        )
-        return self.post_process_urls(urlpatterns)
+            url(r'^(?P<slug>[\w-]+)/$', self.detail_view.as_view(),
+                name='detail'),
+        ]
+        return self.post_process_urls(patterns('', *urls))
 
 
 application = OfferApplication()

oscar/apps/offer/models.py

@@ -67,7 +67,8 @@ class ConditionalOffer(models.Model):
         help_text=_("This is displayed within the customer's basket"))
     slug = models.SlugField(_("Slug"), max_length=128, unique=True, null=True)
     description = models.TextField(_("Description"), blank=True,
-        help_text=_("This is displayed on the offer browsing page"))
+                                   help_text=_("This is displayed on the offer"
+                                               " browsing page"))
 
     # Offers come in a few different types:
     # (a) Offers that are available to all customers on the site.  Eg a
@@ -299,9 +300,9 @@ class ConditionalOffer(models.Model):
 
     def get_num_user_applications(self, user):
         OrderDiscount = models.get_model('order', 'OrderDiscount')
-        aggregates = OrderDiscount.objects.filter(
-            offer_id=self.id, order__user=user).aggregate(
-                total=models.Sum('frequency'))
+        aggregates = OrderDiscount.objects.filter(offer_id=self.id,
+                                                  order__user=user)\
+            .aggregate(total=models.Sum('frequency'))
         return aggregates['total'] if aggregates['total'] is not None else 0
 
     def shipping_discount(self, charge):
@@ -331,33 +332,27 @@ class ConditionalOffer(models.Model):
 
         if self.max_global_applications:
             remaining = self.max_global_applications - self.num_applications
-            desc = _(
-                "Limited to %(total)d uses "
-                "(%(remainder)d remaining)") % {
-                    'total': self.max_global_applications,
-                    'remainder': remaining}
-            restrictions.append({
-                'description': desc,
-                'is_satisfied': remaining > 0})
+            desc = _("Limited to %(total)d uses (%(remainder)d remaining)") \
+                % {'total': self.max_global_applications,
+                   'remainder': remaining}
+            restrictions.append({'description': desc,
+                                 'is_satisfied': remaining > 0})
 
         if self.max_user_applications:
             if self.max_user_applications == 1:
                 desc = _("Limited to 1 use per user")
             else:
-                desc = _(
-                    "Limited to %(total)d uses per user") % {
-                        'total': self.max_user_applications}
-            restrictions.append({
-                'description': desc,
-                'is_satisfied': True})
+                desc = _("Limited to %(total)d uses per user") \
+                    % {'total': self.max_user_applications}
+            restrictions.append({'description': desc,
+                                 'is_satisfied': True})
 
         if self.max_basket_applications:
             if self.max_user_applications == 1:
                 desc = _("Limited to 1 use per basket")
             else:
-                desc = _(
-                    "Limited to %(total)d uses per basket") % {
-                        'total': self.max_basket_applications}
+                desc = _("Limited to %(total)d uses per basket") \
+                    % {'total': self.max_basket_applications}
             restrictions.append({
                 'description': desc,
                 'is_satisfied': True})
@@ -372,10 +367,11 @@ class ConditionalOffer(models.Model):
         if self.start_datetime or self.end_datetime:
             today = now()
             if self.start_datetime and self.end_datetime:
-                desc = _("Available between %(start)s and %(end)s") % {
-                        'start': hide_time_if_zero(self.start_datetime),
-                        'end': hide_time_if_zero(self.end_datetime)}
-                is_satisfied = self.start_datetime <= today <= self.end_datetime
+                desc = _("Available between %(start)s and %(end)s") \
+                    % {'start': hide_time_if_zero(self.start_datetime),
+                       'end': hide_time_if_zero(self.end_datetime)}
+                is_satisfied \
+                    = self.start_datetime <= today <= self.end_datetime
             elif self.start_datetime:
                 desc = _("Available from %(start)s") % {
                     'start': hide_time_if_zero(self.start_datetime)}
@@ -412,11 +408,11 @@ class ConditionalOffer(models.Model):
         cond_range = self.condition.range
         if cond_range.includes_all_products:
             # Return ALL the products
-            return Product.browsable.select_related(
-                'product_class', 'stockrecord').filter(
-                    is_discountable=True).prefetch_related(
-                        'variants', 'images', 'product_class__options',
-                        'product_options')
+            return Product.browsable.select_related('product_class',
+                                                    'stockrecord')\
+                .filter(is_discountable=True)\
+                .prefetch_related('variants', 'images',
+                                  'product_class__options', 'product_options')
         return cond_range.included_products.filter(is_discountable=True)
 
 
@@ -541,7 +537,8 @@ class Benefit(models.Model):
         (SHIPPING_ABSOLUTE,
          _("Discount is a fixed amount of the shipping cost")),
         (SHIPPING_FIXED_PRICE, _("Get shipping for a fixed price")),
-        (SHIPPING_PERCENTAGE, _("Discount is a percentage off of the shipping cost")),
+        (SHIPPING_PERCENTAGE, _("Discount is a percentage off of the shipping"
+                                " cost")),
     )
     type = models.CharField(
         _("Type"), max_length=128, choices=TYPE_CHOICES, blank=True)
@@ -844,7 +841,7 @@ class Range(models.Model):
         # the tests that require more database queries.
 
         if settings.OSCAR_OFFER_BLACKLIST_PRODUCT and \
-            settings.OSCAR_OFFER_BLACKLIST_PRODUCT(product):
+                settings.OSCAR_OFFER_BLACKLIST_PRODUCT(product):
             return False
 
         # Delegate to a proxy class if one is provided
@@ -865,7 +862,8 @@ class Range(models.Model):
         if test_categories:
             for category in product.categories.all():
                 for test_category in test_categories:
-                    if category == test_category or category.is_descendant_of(test_category):
+                    if category == test_category \
+                            or category.is_descendant_of(test_category):
                         return True
         return False
 
@@ -874,14 +872,16 @@ class Range(models.Model):
 
     def _included_product_ids(self):
         if self.__included_product_ids is None:
-            self.__included_product_ids = [row['id'] for row in self.included_products.values('id')]
+            self.__included_product_ids = [row['id'] for row in
+                                           self.included_products.values('id')]
         return self.__included_product_ids
 
     def _excluded_product_ids(self):
         if not self.id:
             return []
         if self.__excluded_product_ids is None:
-            self.__excluded_product_ids = [row['id'] for row in self.excluded_products.values('id')]
+            self.__excluded_product_ids = [row['id'] for row in
+                                           self.excluded_products.values('id')]
         return self.__excluded_product_ids
 
     def _class_ids(self):
@@ -959,7 +959,7 @@ class CountCondition(Condition):
         num_matches = 0
         for line in basket.all_lines():
             if (self.can_apply_condition(line)
-                and line.quantity_without_discount > 0):
+                    and line.quantity_without_discount > 0):
                 num_matches += line.quantity_without_discount
         self._num_matches = num_matches
         return num_matches
@@ -972,8 +972,8 @@ class CountCondition(Condition):
         num_matches = self._get_num_matches(basket)
         delta = self.value - num_matches
         return ungettext('Buy %(delta)d more product from %(range)s',
-                         'Buy %(delta)d more products from %(range)s', delta) % {
-                            'delta': delta, 'range': self.range}
+                         'Buy %(delta)d more products from %(range)s', delta) \
+            % {'delta': delta, 'range': self.range}
 
     def consume_items(self, offer, basket, affected_lines):
         """
@@ -1008,7 +1008,8 @@ class CoverageCondition(Condition):
     An offer condition dependent on the number of DISTINCT matching items from
     the basket.
     """
-    _description = _("Basket includes %(count)d distinct item(s) from %(range)s")
+    _description = _("Basket includes %(count)d distinct item(s) from"
+                     " %(range)s")
 
     @property
     def name(self):
@@ -1036,7 +1037,8 @@ class CoverageCondition(Condition):
             if not line.is_available_for_discount:
                 continue
             product = line.product
-            if (self.can_apply_condition(line) and product.id not in covered_ids):
+            if (self.can_apply_condition(line) and product.id not in
+                    covered_ids):
                 covered_ids.append(product.id)
             if len(covered_ids) >= self.value:
                 return True
@@ -1048,15 +1050,16 @@ class CoverageCondition(Condition):
             if not line.is_available_for_discount:
                 continue
             product = line.product
-            if (self.can_apply_condition(line) and product.id not in covered_ids):
+            if (self.can_apply_condition(line) and product.id not in
+                    covered_ids):
                 covered_ids.append(product.id)
         return len(covered_ids)
 
-    def get_upsell_message(self, offer,  basket):
+    def get_upsell_message(self, offer, basket):
         delta = self.value - self._get_num_covered_products(basket)
         return ungettext('Buy %(delta)d more product from %(range)s',
-                         'Buy %(delta)d more products from %(range)s', delta) % {
-                         'delta': delta, 'range': self.range}
+                         'Buy %(delta)d more products from %(range)s', delta) \
+            % {'delta': delta, 'range': self.range}
 
     def is_partially_satisfied(self, offer, basket):
         return 0 < self._get_num_covered_products(basket) < self.value
@@ -1095,7 +1098,8 @@ class CoverageCondition(Condition):
         covered_ids = []
         value = D('0.00')
         for line in basket.all_lines():
-            if (self.can_apply_condition(line) and line.product.id not in covered_ids):
+            if (self.can_apply_condition(line) and line.product.id not in
+                    covered_ids):
                 covered_ids.append(line.product.id)
                 value += unit_price(offer, line)
             if len(covered_ids) >= self.value:
@@ -1133,7 +1137,8 @@ class ValueCondition(Condition):
         """
         value_of_matches = D('0.00')
         for line in basket.all_lines():
-            if (self.can_apply_condition(line) and line.quantity_without_discount > 0):
+            if (self.can_apply_condition(line) and
+                    line.quantity_without_discount > 0):
                 price = unit_price(offer, line)
                 value_of_matches += price * int(line.quantity_without_discount)
             if value_of_matches >= self.value:
@@ -1145,7 +1150,8 @@ class ValueCondition(Condition):
             return getattr(self, '_value_of_matches')
         value_of_matches = D('0.00')
         for line in basket.all_lines():
-            if (self.can_apply_condition(line) and line.quantity_without_discount > 0):
+            if (self.can_apply_condition(line) and
+                    line.quantity_without_discount > 0):
                 price = unit_price(offer, line)
                 value_of_matches += price * int(line.quantity_without_discount)
         self._value_of_matches = value_of_matches
@@ -1423,7 +1429,8 @@ class FixedPriceBenefit(Benefit):
 
         # Fetch basket lines that are in the range and available to be used in
         # an offer.
-        line_tuples = self.get_applicable_lines(offer, basket, range=condition.range)
+        line_tuples = self.get_applicable_lines(offer, basket,
+                                                range=condition.range)
         if not line_tuples:
             return ZERO_DISCOUNT
 

oscar/apps/offer/receivers.py

@@ -10,8 +10,9 @@ ConditionalOffer = get_model('offer', 'ConditionalOffer')
 
 @receiver(m2m_changed)
 def receive_basket_voucher_change(sender, **kwargs):
-    if (kwargs['model'] == Voucher and kwargs['action'] == 'post_add' and
-        isinstance(kwargs['instance'], AbstractBasket) and kwargs['pk_set']):
+    if (kwargs['model'] == Voucher and kwargs['action'] == 'post_add'
+            and isinstance(kwargs['instance'], AbstractBasket)
+            and kwargs['pk_set']):
         voucher_id = list(kwargs['pk_set'])[0]
         voucher = Voucher._default_manager.get(pk=voucher_id)
         voucher.num_basket_additions += 1

oscar/apps/offer/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')
 ConditionalOffer = get_model('offer', 'ConditionalOffer')
 OrderDiscount = get_model('order', 'OrderDiscount')
 
@@ -19,7 +21,7 @@ class OfferReportCSVFormatter(ReportCSVFormatter):
         writer = self.get_csv_writer(response)
         header_row = [_('Offer'),
                       _('Total discount')
-                     ]
+                      ]
         writer.writerow(header_row)
 
         for offer in offers:
@@ -49,13 +51,15 @@ class OfferReportGenerator(ReportGenerator):
         for discount in discounts:
             if discount.offer_id not in offer_discounts:
                 try:
-                    offer = ConditionalOffer._default_manager.get(id=discount.offer_id)
+                    all_offers = ConditionalOffer._default_manager
+                    offer = all_offers.get(id=discount.offer_id)
                 except ConditionalOffer.DoesNotExist:
                     continue
                 offer_discounts[discount.offer_id] = {
                     'offer': offer,
                     'total_discount': D('0.00')
                 }
-            offer_discounts[discount.offer_id]['total_discount'] += discount.amount
+            offer_discounts[discount.offer_id]['total_discount'] \
+                += discount.amount
 
         return self.formatter.generate_response(offer_discounts.values())

oscar/apps/order/abstract_models.py

@@ -76,13 +76,13 @@ class AbstractOrder(models.Model):
     #: Order status pipeline.  This should be a dict where each (key, value) #:
     #: corresponds to a status and a list of possible statuses that can follow
     #: that one.
-    pipeline = getattr(settings,  'OSCAR_ORDER_STATUS_PIPELINE', {})
+    pipeline = getattr(settings, 'OSCAR_ORDER_STATUS_PIPELINE', {})
 
     #: Order status cascade pipeline.  This should be a dict where each (key,
     #: value) pair corresponds to an *order* status and the corresponding
     #: *line* status that needs to be set when the order is set to the new
     #: status
-    cascade = getattr(settings,  'OSCAR_ORDER_STATUS_CASCADE', {})
+    cascade = getattr(settings, 'OSCAR_ORDER_STATUS_CASCADE', {})
 
     @classmethod
     def all_statuses(cls):
@@ -107,11 +107,12 @@ class AbstractOrder(models.Model):
         if new_status == self.status:
             return
         if new_status not in self.available_statuses():
-            raise exceptions.InvalidOrderStatus(_("'%(new_status)s' is not a valid status for order %(number)s "
-                                       "(current status: '%(status)s')") % {
-                                            'new_status': new_status,
-                                            'number': self.number,
-                                            'status': self.status})
+            raise exceptions.InvalidOrderStatus(
+                _("'%(new_status)s' is not a valid status for order %(number)s"
+                  " (current status: '%(status)s')")
+                % {'new_status': new_status,
+                   'number': self.number,
+                   'status': self.status})
         self.status = new_status
         if new_status in self.cascade:
             for line in self.lines.all():
@@ -219,7 +220,8 @@ class AbstractOrder(models.Model):
             event_name = event.event_type.name
             if event_name not in map:
                 map[event_name] = []
-            map[event_name] = list(chain(map[event_name], event.line_quantities.all()))
+            map[event_name] = list(chain(map[event_name],
+                                         event.line_quantities.all()))
 
         # Determine last complete event
         status = _("In progress")
@@ -256,7 +258,7 @@ class AbstractOrder(models.Model):
 
     class Meta:
         abstract = True
-        ordering = ['-date_placed',]
+        ordering = ['-date_placed']
         verbose_name = _("Order")
         verbose_name_plural = _("Orders")
 
@@ -264,7 +266,8 @@ class AbstractOrder(models.Model):
         return u"#%s" % (self.number,)
 
     def verification_hash(self):
-        return hashlib.md5('%s%s' % (self.number, settings.SECRET_KEY)).hexdigest()
+        hash = hashlib.md5('%s%s' % (self.number, settings.SECRET_KEY))
+        return hash.hexdigest()
 
     @property
     def email(self):
@@ -297,11 +300,13 @@ class AbstractOrderNote(models.Model):
     This are often used for audit purposes too.  IE, whenever an admin
     makes a change to an order, we create a note to record what happened.
     """
-    order = models.ForeignKey('order.Order', related_name="notes", verbose_name=_("Order"))
+    order = models.ForeignKey('order.Order', related_name="notes",
+                              verbose_name=_("Order"))
 
     # These are sometimes programatically generated so don't need a
     # user everytime
-    user = models.ForeignKey(AUTH_USER_MODEL, null=True, verbose_name=_("User"))
+    user = models.ForeignKey(AUTH_USER_MODEL, null=True,
+                             verbose_name=_("User"))
 
     # We allow notes to be classified although this isn't always needed
     INFO, WARNING, ERROR, SYSTEM = 'Info', 'Warning', 'Error', 'System'
@@ -348,7 +353,8 @@ class AbstractCommunicationEvent(models.Model):
         ordering = ['-date_created']
 
     def __unicode__(self):
-        return _("'%(type)s' event for order #%(number)s") % {'type': self.event_type.name, 'number': self.order.number}
+        return _("'%(type)s' event for order #%(number)s") \
+            % {'type': self.event_type.name, 'number': self.order.number}
 
 
 # LINES
@@ -432,7 +438,7 @@ class AbstractLine(models.Model):
     # Partners often want to assign some status to each line to help with their
     # own business processes.
     status = models.CharField(_("Status"), max_length=255,
-                             null=True, blank=True)
+                              null=True, blank=True)
 
     # Estimated dispatch date - should be set at order time
     est_dispatch_date = models.DateField(
@@ -441,7 +447,7 @@ class AbstractLine(models.Model):
     #: Order status pipeline.  This should be a dict where each (key, value)
     #: corresponds to a status and the possible statuses that can follow that
     #: one.
-    pipeline = getattr(settings,  'OSCAR_LINE_STATUS_PIPELINE', {})
+    pipeline = getattr(settings, 'OSCAR_LINE_STATUS_PIPELINE', {})
 
     class Meta:
         abstract = True
@@ -479,8 +485,10 @@ class AbstractLine(models.Model):
         if new_status == self.status:
             return
         if new_status not in self.available_statuses():
-            raise exceptions.InvalidLineStatus(_("'%(new_status)s' is not a valid status (current status: '%(status)s')") % {
-                                    'new_status': new_status, 'status': self.status})
+            raise exceptions.InvalidLineStatus(
+                _("'%(new_status)s' is not a valid status (current status:"
+                  " '%(status)s')")
+                % {'new_status': new_status, 'status': self.status})
         self.status = new_status
         self.save()
     set_status.alters_data = True
@@ -508,11 +516,13 @@ class AbstractLine(models.Model):
 
     @property
     def discount_incl_tax(self):
-        return self.line_price_before_discounts_incl_tax - self.line_price_incl_tax
+        return self.line_price_before_discounts_incl_tax \
+            - self.line_price_incl_tax
 
     @property
     def discount_excl_tax(self):
-        return self.line_price_before_discounts_excl_tax - self.line_price_excl_tax
+        return self.line_price_before_discounts_excl_tax \
+            - self.line_price_excl_tax
 
     @property
     def line_price_tax(self):
@@ -568,8 +578,7 @@ class AbstractLine(models.Model):
         event of the passed type.
         """
         result = self.shipping_event_quantities.filter(
-            event__event_type=event_type).aggregate(
-                Sum('quantity'))
+            event__event_type=event_type).aggregate(Sum('quantity'))
         if result['quantity__sum'] is None:
             return 0
         else:
@@ -616,8 +625,7 @@ class AbstractLine(models.Model):
         event of the passed type.
         """
         result = self.payment_event_quantities.filter(
-            event__event_type=event_type).aggregate(
-                Sum('quantity'))
+            event__event_type=event_type).aggregate(Sum('quantity'))
         if result['quantity__sum'] is None:
             return 0
         else:

oscar/apps/order/models.py

@@ -1,5 +1,6 @@
-from oscar.apps.order.abstract_models import *
-from oscar.apps.address.abstract_models import AbstractShippingAddress, AbstractBillingAddress
+from oscar.apps.order.abstract_models import *  # noqa
+from oscar.apps.address.abstract_models import (AbstractShippingAddress,
+                                                AbstractBillingAddress)
 
 
 class Order(AbstractOrder):
@@ -20,7 +21,7 @@ class ShippingAddress(AbstractShippingAddress):
 
 class BillingAddress(AbstractBillingAddress):
     pass
-    
+
 
 class Line(AbstractLine):
     pass
@@ -52,6 +53,3 @@ class PaymentEventType(AbstractPaymentEventType):
 
 class OrderDiscount(AbstractOrderDiscount):
     pass
-
-
-    

oscar/apps/order/processing.py

@@ -82,8 +82,8 @@ class EventHandler(object):
             # 'is_shipping_event_permitted' and enforce the correct order of
             # shipping events.
             if not line.is_shipping_event_permitted(event_type, qty):
-                msg = _("The selected quantity for line #%(line_id)s is too large") % {
-                    'line_id': line.id}
+                msg = _("The selected quantity for line #%(line_id)s is too"
+                        " large") % {'line_id': line.id}
                 errors.append(msg)
         if errors:
             raise exceptions.InvalidShippingEvent(", ".join(errors))
@@ -93,8 +93,8 @@ class EventHandler(object):
         errors = []
         for line, qty in zip(lines, line_quantities):
             if not line.is_payment_event_permitted(event_type, qty):
-                msg = _("The selected quantity for line #%(line_id)s is too large") % {
-                    'line_id': line.id}
+                msg = _("The selected quantity for line #%(line_id)s is too"
+                        " large") % {'line_id': line.id}
                 errors.append(msg)
         if errors:
             raise exceptions.InvalidPaymentEvent(", ".join(errors))

oscar/apps/order/reports.py

@@ -5,8 +5,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')
 Order = get_model('order', 'Order')
 
 

oscar/apps/order/signals.py

@@ -1,3 +1,3 @@
 import django.dispatch
 
-order_placed = django.dispatch.Signal(providing_args=["order", "user"])
+order_placed = django.dispatch.Signal(providing_args=["order", "user"])

oscar/apps/order/utils.py

@@ -60,7 +60,8 @@ class OrderCreator(object):
         except Order.DoesNotExist:
             pass
         else:
-            raise ValueError(_("There is already an order with number %s") % order_number)
+            raise ValueError(_("There is already an order with number %s")
+                             % order_number)
 
         # Ok - everything seems to be in order, let's place the order
         order = self.create_order_model(
@@ -73,7 +74,8 @@ class OrderCreator(object):
         for application in basket.offer_applications:
             # Trigger any deferred benefits from offers and capture the
             # resulting message
-            application['message'] = application['offer'].apply_deferred_benefit(basket)
+            application['message'] \
+                = application['offer'].apply_deferred_benefit(basket)
             # Record offer application results
             if application['result'].affects_shipping:
                 # Skip zero shipping discounts
@@ -94,8 +96,8 @@ class OrderCreator(object):
 
         return order
 
-    def create_order_model(self, user, basket, shipping_address, shipping_method,
-                           billing_address, total,
+    def create_order_model(self, user, basket, shipping_address,
+                           shipping_method, billing_address, total,
                            order_number, status, **extra_order_fields):
         """
         Creates an order model.
@@ -150,17 +152,22 @@ class OrderCreator(object):
             'upc': product.upc,
             'quantity': basket_line.quantity,
             # Price details
-            'line_price_excl_tax': basket_line.line_price_excl_tax_incl_discounts,
-            'line_price_incl_tax': basket_line.line_price_incl_tax_incl_discounts,
-            'line_price_before_discounts_excl_tax': basket_line.line_price_excl_tax,
-            'line_price_before_discounts_incl_tax': basket_line.line_price_incl_tax,
+            'line_price_excl_tax':
+            basket_line.line_price_excl_tax_incl_discounts,
+            'line_price_incl_tax':
+            basket_line.line_price_incl_tax_incl_discounts,
+            'line_price_before_discounts_excl_tax':
+            basket_line.line_price_excl_tax,
+            'line_price_before_discounts_incl_tax':
+            basket_line.line_price_incl_tax,
             # Reporting details
             'unit_cost_price': stockrecord.cost_price,
             'unit_price_incl_tax': basket_line.unit_price_incl_tax,
             'unit_price_excl_tax': basket_line.unit_price_excl_tax,
             'unit_retail_price': stockrecord.price_retail,
             # Shipping details
-            'est_dispatch_date': basket_line.stockinfo.availability.dispatch_date
+            'est_dispatch_date':
+            basket_line.stockinfo.availability.dispatch_date
         }
         extra_line_fields = extra_line_fields or {}
         if hasattr(settings, 'OSCAR_INITIAL_LINE_STATUS'):

oscar/apps/partner/abstract_models.py

@@ -284,8 +284,8 @@ class AbstractStockRecord(models.Model):
             "removed in 0.7.  Use a strategy class to determine availability "
             "instead"), DeprecationWarning)
         return get_partner_wrapper(
-            self.partner_id).is_purchase_permitted(
-                self, user, quantity, product)
+            self.partner_id).is_purchase_permitted(self, user, quantity,
+                                                   product)
 
     @property
     def availability_code(self):
@@ -399,7 +399,8 @@ class AbstractStockAlert(models.Model):
     close.alters_data = True
 
     def __unicode__(self):
-        return _('<stockalert for "%(stock)s" status %(status)s>') % {'stock': self.stockrecord, 'status': self.status}
+        return _('<stockalert for "%(stock)s" status %(status)s>') \
+            % {'stock': self.stockrecord, 'status': self.status}
 
     class Meta:
         abstract = True

oscar/apps/partner/admin.py

@@ -6,9 +6,10 @@ StockRecord = get_model('partner', 'StockRecord')
 
 
 class StockRecordAdmin(admin.ModelAdmin):
-    list_display = ('product', 'partner', 'partner_sku', 'price_excl_tax', 'cost_price', 'num_in_stock')
+    list_display = ('product', 'partner', 'partner_sku', 'price_excl_tax',
+                    'cost_price', 'num_in_stock')
     list_filter = ('partner',)
-    
+
 
 admin.site.register(Partner)
 admin.site.register(StockRecord, StockRecordAdmin)

oscar/apps/partner/models.py

@@ -19,4 +19,4 @@ class StockAlert(AbstractStockAlert):
     pass
 
 
-from oscar.apps.partner.receivers import *
+from oscar.apps.partner.receivers import *  # noqa

oscar/apps/partner/receivers.py

@@ -2,7 +2,8 @@ from django.dispatch import receiver
 from django.db.models.signals import post_save
 
 from oscar.core.loading import get_classes
-StockRecord, StockAlert = get_classes('partner.models', ('StockRecord', 'StockAlert'))
+StockRecord, StockAlert = get_classes('partner.models', ['StockRecord',
+                                                         'StockAlert'])
 
 
 @receiver(post_save, sender=StockRecord)

oscar/apps/partner/strategy.py

@@ -62,7 +62,8 @@ class Base(object):
 
         - ``price``: a pricing policy object.
         - ``availability``: an availability policy object.
-        - ``stockrecord``: the stockrecord that is being used to calculate prices and
+        - ``stockrecord``: the stockrecord that is being used to calculate
+          prices and
 
         If a stockrecord is passed, return the appropriate ``StockInfo``
         instance for that product and stockrecord is returned.
@@ -179,8 +180,8 @@ class FixedRateTax(object):
     Pricing policy mixin for use with the ``Structured`` base strategy.
     This mixin applies a fixed rate tax to the base price from the product's
     stockrecord.
-    The price_incl_tax is quantized to two decimal places. Rounding behaviour is
-    Decimal's default
+    The price_incl_tax is quantized to two decimal places. Rounding behaviour
+    is Decimal's default
     """
     rate = D('0.20')
     exponent = D('0.01')

oscar/apps/partner/utils.py

@@ -8,7 +8,8 @@ from oscar.apps.catalogue.categories import create_from_breadcrumbs
 from oscar.apps.dashboard.reports.csv_utils import CsvUnicodeReader
 from oscar.core.loading import get_class, get_classes
 ImportError = get_class('partner.exceptions', 'ImportError')
-Partner, StockRecord = get_classes('partner.models', ('Partner', 'StockRecord'))
+Partner, StockRecord = get_classes('partner.models', ['Partner',
+                                                      'StockRecord'])
 ProductClass, Product, Category, ProductCategory = get_classes(
     'catalogue.models', ('ProductClass', 'Product', 'Category',
                          'ProductCategory'))
@@ -23,9 +24,11 @@ class StockImporter(object):
         try:
             self._partner = Partner.objects.get(name=partner)
         except Partner.DoesNotExist:
-            name_list = ", ".join([d['name'] for d in Partner.objects.values('name')])
-            raise ImportError(_("Partner named '%(partner)s' does not exist (existing partners: %(list)s)") % {
-                              'partner': partner, 'list': name_list})
+            name_list = ", ".join([d['name']
+                                   for d in Partner.objects.values('name')])
+            raise ImportError(_("Partner named '%(partner)s' does not exist"
+                                " (existing partners: %(list)s)")
+                              % {'partner': partner, 'list': name_list})
 
     def handle(self, file_path=None):
         u"""Handles the actual import process"""
@@ -40,27 +43,35 @@ class StockImporter(object):
                  'unchanged_items': 0,
                  'unmatched_items': 0}
         row_number = 0
-        for row in CsvUnicodeReader(open(file_path, 'rb'), delimiter=self._delimiter, quotechar='"', escapechar='\\'):
+        for row in CsvUnicodeReader(open(file_path, 'rb'),
+                                    delimiter=self._delimiter, quotechar='"',
+                                    escapechar='\\'):
             row_number += 1
             self._import_row(row_number, row, stats)
-        msg = "\tUpdated items: %d\n\tUnchanged items: %d\n\tUnmatched items: %d" % (
-            stats['updated_items'],
-            stats['unchanged_items'],
-            stats['unmatched_items'])
+        msg = "\tUpdated items: %d\n\tUnchanged items: %d\n" \
+            "\tUnmatched items: %d" % (stats['updated_items'],
+                                       stats['unchanged_items'],
+                                       stats['unmatched_items'])
         self.logger.info(msg)
 
     def _import_row(self, row_number, row, stats):
         if len(row) != 3:
-            self.logger.error("Row number %d has an invalid number of fields, skipping..." % row_number)
+            self.logger.error("Row number %d has an invalid number of fields,"
+                              " skipping..." % row_number)
         else:
-            self._update_stockrecord(*row[:3], row_number=row_number, stats=stats)
+            self._update_stockrecord(*row[:3], row_number=row_number,
+                                     stats=stats)
 
-    def _update_stockrecord(self, partner_sku, price_excl_tax, num_in_stock, row_number, stats):
+    def _update_stockrecord(self, partner_sku, price_excl_tax, num_in_stock,
+                            row_number, stats):
         try:
-            stock = StockRecord.objects.get(partner=self._partner, partner_sku=partner_sku)
+            stock = StockRecord.objects.get(partner=self._partner,
+                                            partner_sku=partner_sku)
         except StockRecord.DoesNotExist:
             stats['unmatched_items'] += 1
-            self.logger.error("\t - Row %d: StockRecord for partner '%s' and sku '%s' does not exist, skipping..." % (row_number, self._partner, partner_sku))
+            self.logger.error("\t - Row %d: StockRecord for partner '%s' and"
+                              " sku '%s' does not exist, skipping..."
+                              % (row_number, self._partner, partner_sku))
             return
 
         price_changed = False
@@ -123,28 +134,34 @@ class CatalogueImporter(object):
         stats = {'new_items': 0,
                  'updated_items': 0}
         row_number = 0
-        for row in CsvUnicodeReader(open(file_path,'rb'), delimiter=self._delimiter, quotechar='"', escapechar='\\'):
+        for row in CsvUnicodeReader(open(file_path, 'rb'),
+                                    delimiter=self._delimiter, quotechar='"',
+                                    escapechar='\\'):
             row_number += 1
             self._import_row(row_number, row, stats)
-        msg = "New items: %d, updated items: %d" % (stats['new_items'], stats['updated_items'])
+        msg = "New items: %d, updated items: %d" % (stats['new_items'],
+                                                    stats['updated_items'])
         self.logger.info(msg)
 
     def _import_row(self, row_number, row, stats):
         if len(row) != 5 and len(row) != 9:
-            self.logger.error("Row number %d has an invalid number of fields (%d), skipping..." % (row_number, len(row)))
+            self.logger.error("Row number %d has an invalid number of fields"
+                              " (%d), skipping..." % (row_number, len(row)))
             return
         item = self._create_item(*row[:5], stats=stats)
         if len(row) == 9:
             # With stock data
             self._create_stockrecord(item, *row[5:9], stats=stats)
 
-    def _create_item(self, product_class, category_str, upc, title, description, stats):
+    def _create_item(self, product_class, category_str, upc, title,
+                     description, stats):
         # Ignore any entries that are NULL
         if description == 'NULL':
             description = ''
 
         # Create item class and item
-        product_class, __ = ProductClass.objects.get_or_create(name=product_class)
+        product_class, __ \
+            = ProductClass.objects.get_or_create(name=product_class)
         try:
             item = Product.objects.get(upc=upc)
             stats['updated_items'] += 1

oscar/apps/partner/wrappers.py

@@ -21,7 +21,8 @@ class DefaultWrapper(object):
             return True
         return stockrecord.net_stock_level > 0
 
-    def is_purchase_permitted(self, stockrecord, user=None, quantity=1, product=None):
+    def is_purchase_permitted(self, stockrecord, user=None, quantity=1,
+                              product=None):
         """
         Test whether a particular purchase is possible (is a user buying a
         given quantity of the product)
@@ -56,7 +57,8 @@ class DefaultWrapper(object):
 
         This is normally used within CSS to add icons to stock messages
 
-        :param oscar.apps.partner.models.StockRecord stockrecord: stockrecord instance
+        :param oscar.apps.partner.models.StockRecord stockrecord: stockrecord
+        instance
         """
         if stockrecord.net_stock_level > 0:
             return self.CODE_IN_STOCK
@@ -68,7 +70,8 @@ class DefaultWrapper(object):
         """
         Return an availability message for the passed stockrecord.
 
-        :param oscar.apps.partner.models.StockRecord stockrecord: stockrecord instance
+        :param oscar.apps.partner.models.StockRecord stockrecord: stockrecord
+        instance
         """
         if stockrecord.net_stock_level > 0:
             return _("In stock (%d available)") % stockrecord.net_stock_level

oscar/apps/payment/exceptions.py

@@ -16,12 +16,11 @@ class InvalidGatewayRequestError(PaymentError):
 
 class InsufficientPaymentSources(PaymentError):
     """
-    Exception for when a user attempts to checkout without
-    specifying enough payment sources to cover the entire order 
-    total. 
-    
-    Eg. When selecting an allocation off a giftcard but not specifying
-        a bankcard to take the remainder from.
+    Exception for when a user attempts to checkout without specifying enough
+    payment sources to cover the entire order total.
+
+    Eg. When selecting an allocation off a giftcard but not specifying a
+    bankcard to take the remainder from.
     """
     pass
 
@@ -30,15 +29,15 @@ class RedirectRequired(PaymentError):
     """
     Exception to be used when payment processsing requires a redirect
     """
-    
+
     def __init__(self, url):
         self.url = url
 
 
 class UnableToTakePayment(PaymentError):
     """
-    Exception to be used for ANTICIPATED payment errors (eg card number wrong, expiry date
-    has passed).  The message passed here will be shown to the end user.
+    Exception to be used for ANTICIPATED payment errors (eg card number wrong,
+    expiry date has passed).  The message passed here will be shown to the end
+    user.
     """
     pass
-    

oscar/apps/promotions/admin.py

@@ -1,25 +1,31 @@
 from django.contrib import admin
 
-from oscar.apps.promotions.models import Image, MultiImage, RawHTML, HandPickedProductList, OrderedProduct, AutomaticProductList, TabbedBlock, \
-                                  PagePromotion, KeywordPromotion, SingleProduct
+from oscar.apps.promotions.models import Image, MultiImage, RawHTML, \
+    HandPickedProductList, OrderedProduct, AutomaticProductList, TabbedBlock, \
+    PagePromotion, KeywordPromotion, SingleProduct
 
 
 class OrderProductInline(admin.TabularInline):
     model = OrderedProduct
-    
+
+
 class HandPickedProductListAdmin(admin.ModelAdmin):
     inlines = [OrderProductInline]
 
+
 class PagePromotionAdmin(admin.ModelAdmin):
     list_display = ['page_url', 'content_object', 'position']
     exclude = ['clicks']
-    
+
     def get_form(self, request, obj=None, **kwargs):
-        form = super(PagePromotionAdmin,self).get_form(request, obj, **kwargs)
+        form = super(PagePromotionAdmin, self).get_form(request, obj, **kwargs)
         # Only allow links to models within the promotions app
-        form.base_fields['content_type'].queryset = form.base_fields['content_type'].queryset.filter(app_label='promotions')
+        form.base_fields['content_type'].queryset \
+            = form.base_fields['content_type'].queryset\
+            .filter(app_label='promotions')
         return form
 
+
 class KeywordPromotionAdmin(admin.ModelAdmin):
     list_display = ['keyword', 'position', 'clicks']
     readonly_fields = ['clicks']
@@ -34,5 +40,3 @@ admin.site.register(TabbedBlock)
 admin.site.register(PagePromotion, PagePromotionAdmin)
 admin.site.register(KeywordPromotion, KeywordPromotionAdmin)
 admin.site.register(SingleProduct)
-
-