Run source through isort

This also adds isort settings.

requirements.txt

@@ -33,6 +33,7 @@ pytest-xdist==1.11
 tox==1.8.1
 coveralls==0.4.4
 behave==1.2.4
+isort==4.2.2
 
 # Misc
 flake8==2.2.5

setup.cfg

@@ -8,3 +8,11 @@ norecursedirs = .* *.egg sites src
 
 [flake8]
 max-line-length=99
+
+[isort]
+line_length = 79
+multi_line_output = 4
+balanced_wrapping = true
+known_first_party = oscar,tests
+use_parentheses = true
+skip_glob=*/src/oscar/**/migrations/*.py,*/tests/**/*.py

src/oscar/app.py

@@ -1,6 +1,6 @@
 # flake8: noqa, because URL syntax is more readable with long lines
 
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 from django.contrib.auth import views as auth_views
 from django.core.urlresolvers import reverse_lazy
 

src/oscar/apps/address/abstract_models.py

@@ -2,14 +2,15 @@ import re
 import zlib
 
 from django.conf import settings
+from django.core import exceptions
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
-from django.core import exceptions
+from django.utils.six.moves import filter
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import pgettext_lazy
 
 from oscar.core.compat import AUTH_USER_MODEL
-from oscar.models.fields import UppercaseCharField, PhoneNumberField
-from django.utils.six.moves import filter
+from oscar.models.fields import PhoneNumberField, UppercaseCharField
 
 
 @python_2_unicode_compatible

src/oscar/apps/address/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from oscar.core.loading import get_model
 
 

src/oscar/apps/address/forms.py

@@ -1,5 +1,5 @@
-from django.conf import settings
 from django import forms
+from django.conf import settings
 
 from oscar.core.loading import get_model
 from oscar.views.generic import PhoneNumberMixin

src/oscar/apps/address/models.py

@@ -1,6 +1,6 @@
-from oscar.core.loading import is_model_registered
 from oscar.apps.address.abstract_models import (
-    AbstractUserAddress, AbstractCountry)
+    AbstractCountry, AbstractUserAddress)
+from oscar.core.loading import is_model_registered
 
 __all__ = []
 

src/oscar/apps/analytics/abstract_models.py

@@ -3,6 +3,7 @@ from decimal import Decimal
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
+
 from oscar.core.compat import AUTH_USER_MODEL
 
 

src/oscar/apps/analytics/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from oscar.core.loading import get_model
 
 

src/oscar/apps/analytics/models.py

@@ -1,7 +1,7 @@
-from oscar.core.loading import is_model_registered
 from oscar.apps.analytics.abstract_models import (
-    AbstractProductRecord, AbstractUserRecord,
-    AbstractUserProductView, AbstractUserSearch)
+    AbstractProductRecord, AbstractUserProductView,
+    AbstractUserRecord, AbstractUserSearch)
+from oscar.core.loading import is_model_registered
 
 __all__ = []
 

src/oscar/apps/analytics/receivers.py

@@ -1,11 +1,11 @@
 import logging
 
+from django.db import IntegrityError
 from django.db.models import F
 from django.dispatch import receiver
-from django.db import IntegrityError
 
-from oscar.core.loading import get_class, get_classes
 from oscar.apps.search.signals import user_search
+from oscar.core.loading import get_class, get_classes
 
 UserSearch, UserRecord, ProductRecord, UserProductView = get_classes(
     'analytics.models', ['UserSearch', 'UserRecord', 'ProductRecord',

src/oscar/apps/analytics/reports.py

@@ -1,7 +1,6 @@
-from oscar.core.loading import get_model
 from django.utils.translation import ugettext_lazy as _
 
-from oscar.core.loading import get_class
+from oscar.core.loading import get_class, get_model
 
 ReportGenerator = get_class('dashboard.reports.reports', 'ReportGenerator')
 ReportCSVFormatter = get_class('dashboard.reports.reports',

src/oscar/apps/analytics/scores.py

@@ -1,4 +1,5 @@
 from django.db.models import F
+
 from oscar.core.loading import get_model
 
 ProductRecord = get_model('analytics', 'ProductRecord')

src/oscar/apps/basket/abstract_models.py

@@ -1,18 +1,18 @@
-from decimal import Decimal as D
 import zlib
+from decimal import Decimal as D
 
+from django.conf import settings
+from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.db import models
 from django.db.models import Sum
-from django.conf import settings
 from django.utils.encoding import python_2_unicode_compatible, smart_text
 from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
-from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 
 from oscar.apps.basket.managers import OpenBasketManager, SavedBasketManager
 from oscar.apps.offer import results
-from oscar.core.utils import get_default_currency
 from oscar.core.compat import AUTH_USER_MODEL
+from oscar.core.utils import get_default_currency
 from oscar.templatetags.currency_filters import currency
 
 

src/oscar/apps/basket/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from oscar.core.loading import get_model
 
 Line = get_model('basket', 'line')

src/oscar/apps/basket/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.conf import settings
-from django.forms.models import modelformset_factory, BaseModelFormSet
 from django.db.models import Sum
+from django.forms.models import BaseModelFormSet, modelformset_factory
 from django.utils.translation import ugettext_lazy as _
 
 from oscar.core.loading import get_model

src/oscar/apps/basket/middleware.py

@@ -1,9 +1,8 @@
 from django.conf import settings
-from django.core.signing import Signer, BadSignature
+from django.core.signing import BadSignature, Signer
 from django.utils.functional import SimpleLazyObject, empty
 
-from oscar.core.loading import get_model
-from oscar.core.loading import get_class
+from oscar.core.loading import get_class, get_model
 
 Applicator = get_class('offer.utils', 'Applicator')
 Basket = get_model('basket', 'basket')

src/oscar/apps/basket/models.py

@@ -1,6 +1,6 @@
-from oscar.core.loading import is_model_registered
 from oscar.apps.basket.abstract_models import (
     AbstractBasket, AbstractLine, AbstractLineAttribute)
+from oscar.core.loading import is_model_registered
 
 __all__ = [
     'InvalidBasketLineError',

src/oscar/apps/basket/reports.py

@@ -1,6 +1,6 @@
-from oscar.core.loading import get_model
 from django.utils.translation import ugettext_lazy as _
-from oscar.core.loading import get_class
+
+from oscar.core.loading import get_class, get_model
 
 ReportGenerator = get_class('dashboard.reports.reports', 'ReportGenerator')
 ReportCSVFormatter = get_class('dashboard.reports.reports',

src/oscar/apps/basket/views.py

@@ -2,22 +2,21 @@ import json
 
 from django import shortcuts
 from django.contrib import messages
-from django.shortcuts import redirect
-from django.template.loader import render_to_string
-from django.template import RequestContext
+from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
 from django.http import HttpResponse
-from django.views.generic import FormView, View
+from django.shortcuts import redirect
+from django.template import RequestContext
+from django.template.loader import render_to_string
 from django.utils.http import is_safe_url
 from django.utils.translation import ugettext_lazy as _
-from django.core.exceptions import ObjectDoesNotExist
-
+from django.views.generic import FormView, View
 from extra_views import ModelFormSetView
 
-from oscar.core import ajax
-from oscar.core.utils import redirect_to_referrer, safe_referrer
 from oscar.apps.basket import signals
+from oscar.core import ajax
 from oscar.core.loading import get_class, get_classes, get_model
+from oscar.core.utils import redirect_to_referrer, safe_referrer
 
 Applicator = get_class('offer.utils', 'Applicator')
 (BasketLineFormSet, BasketLineForm, AddToBasketForm, BasketVoucherForm,

src/oscar/apps/catalogue/abstract_models.py

@@ -1,32 +1,32 @@
-import os
-from django.utils import six
-from datetime import datetime, date
 import logging
+import os
+from datetime import date, datetime
 
-from django.utils.html import strip_tags
-from django.utils.safestring import mark_safe
 from django.conf import settings
+from django.contrib.contenttypes.fields import GenericForeignKey
+from django.contrib.contenttypes.models import ContentType
 from django.contrib.staticfiles.finders import find
 from django.core.cache import cache
-from django.core.exceptions import ValidationError, ImproperlyConfigured
+from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.core.files.base import File
 from django.core.urlresolvers import reverse
 from django.core.validators import RegexValidator
 from django.db import models
-from django.db.models import Sum, Count
+from django.db.models import Count, Sum
+from django.utils import six
 from django.utils.encoding import python_2_unicode_compatible
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 from django.utils.functional import cached_property
-from django.contrib.contenttypes.fields import GenericForeignKey
-from django.contrib.contenttypes.models import ContentType
-
+from django.utils.html import strip_tags
+from django.utils.safestring import mark_safe
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import pgettext_lazy
 from treebeard.mp_tree import MP_Node
 
 from oscar.core.decorators import deprecated
+from oscar.core.loading import get_class, get_classes, get_model
 from oscar.core.utils import slugify
 from oscar.core.validators import non_python_keyword
-from oscar.core.loading import get_classes, get_model, get_class
-from oscar.models.fields import NullCharField, AutoSlugField
+from oscar.models.fields import AutoSlugField, NullCharField
 
 ProductManager, BrowsableProductManager = get_classes(
     'catalogue.managers', ['ProductManager', 'BrowsableProductManager'])

src/oscar/apps/catalogue/app.py

@@ -1,8 +1,8 @@
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 
+from oscar.apps.catalogue.reviews.app import application as reviews_app
 from oscar.core.application import Application
 from oscar.core.loading import get_class
-from oscar.apps.catalogue.reviews.app import application as reviews_app
 
 
 class BaseCatalogueApplication(Application):

src/oscar/apps/catalogue/models.py

@@ -1,8 +1,8 @@
 """
 Vanilla product models
 """
-from oscar.core.loading import is_model_registered
 from oscar.apps.catalogue.abstract_models import *  # noqa
+from oscar.core.loading import is_model_registered
 
 __all__ = ['ProductAttributesContainer']
 

src/oscar/apps/catalogue/reviews/abstract_models.py

@@ -2,13 +2,14 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse
 from django.db import models
-from django.db.models import Sum, Count
+from django.db.models import Count, Sum
 from django.utils.encoding import python_2_unicode_compatible
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import pgettext_lazy
 
 from oscar.apps.catalogue.reviews.managers import ApprovedReviewsManager
-from oscar.core.compat import AUTH_USER_MODEL
 from oscar.core import validators
+from oscar.core.compat import AUTH_USER_MODEL
 
 
 @python_2_unicode_compatible

src/oscar/apps/catalogue/reviews/forms.py

@@ -1,7 +1,8 @@
 from django import forms
-from oscar.core.loading import get_model
 from django.utils.translation import ugettext_lazy as _
 
+from oscar.core.loading import get_model
+
 Vote = get_model('reviews', 'vote')
 ProductReview = get_model('reviews', 'productreview')
 

src/oscar/apps/catalogue/reviews/models.py

@@ -1,7 +1,6 @@
+from oscar.apps.catalogue.reviews.abstract_models import (
+    AbstractProductReview, AbstractVote)
 from oscar.core.loading import is_model_registered
-from oscar.apps.catalogue.reviews.abstract_models import \
-    AbstractProductReview, AbstractVote
-
 
 if not is_model_registered('reviews', 'ProductReview'):
     class ProductReview(AbstractProductReview):

src/oscar/apps/catalogue/reviews/views.py

@@ -1,12 +1,12 @@
-from django.shortcuts import get_object_or_404, redirect
-from django.views.generic import ListView, DetailView, CreateView, View
+from django.conf import settings
 from django.contrib import messages
+from django.shortcuts import get_object_or_404, redirect
 from django.utils.translation import ugettext_lazy as _
-from django.conf import settings
+from django.views.generic import CreateView, DetailView, ListView, View
 
-from oscar.core.loading import get_model, get_classes
-from oscar.core.utils import redirect_to_referrer
 from oscar.apps.catalogue.reviews.signals import review_added
+from oscar.core.loading import get_classes, get_model
+from oscar.core.utils import redirect_to_referrer
 
 ProductReviewForm, VoteForm, SortReviewsForm = get_classes(
     'catalogue.reviews.forms',

src/oscar/apps/catalogue/signals.py

@@ -1,5 +1,4 @@
 import django.dispatch
 
-
 product_viewed = django.dispatch.Signal(
     providing_args=["product", "user", "request", "response"])

src/oscar/apps/catalogue/utils.py

@@ -1,19 +1,19 @@
 import os
-import zlib
+import shutil
 import tarfile
-import zipfile
 import tempfile
-import shutil
-from PIL import Image
+import zipfile
+import zlib
 
-from django.core.files import File
 from django.core.exceptions import FieldError
+from django.core.files import File
 from django.db.transaction import atomic
 from django.utils.translation import ugettext_lazy as _
+from PIL import Image
 
-from oscar.core.loading import get_model
 from oscar.apps.catalogue.exceptions import (
-    ImageImportError, IdenticalImageError, InvalidImageArchive)
+    IdenticalImageError, ImageImportError, InvalidImageArchive)
+from oscar.core.loading import get_model
 
 Category = get_model('catalogue', 'category')
 Product = get_model('catalogue', 'product')

src/oscar/apps/catalogue/views.py

@@ -1,14 +1,15 @@
 import warnings
+
 from django.contrib import messages
 from django.core.paginator import InvalidPage
-from django.utils.http import urlquote
-from django.http import HttpResponsePermanentRedirect, Http404
+from django.http import Http404, HttpResponsePermanentRedirect
 from django.shortcuts import get_object_or_404, redirect
-from django.views.generic import DetailView, TemplateView
+from django.utils.http import urlquote
 from django.utils.translation import ugettext_lazy as _
+from django.views.generic import DetailView, TemplateView
 
-from oscar.core.loading import get_class, get_model
 from oscar.apps.catalogue.signals import product_viewed
+from oscar.core.loading import get_class, get_model
 
 Product = get_model('catalogue', 'product')
 ProductReview = get_model('reviews', 'ProductReview')

src/oscar/apps/checkout/app.py

@@ -1,6 +1,6 @@
+from django.conf import settings
 from django.conf.urls import url
 from django.contrib.auth.decorators import login_required
-from django.conf import settings
 
 from oscar.core.application import Application
 from oscar.core.loading import get_class

src/oscar/apps/checkout/forms.py

@@ -1,12 +1,11 @@
 from django import forms
-from oscar.core.loading import get_model
 from django.contrib.auth.forms import AuthenticationForm
 from django.utils.translation import ugettext_lazy as _
 
 from oscar.apps.address.forms import AbstractAddressForm
 from oscar.apps.customer.utils import normalise_email
 from oscar.core.compat import get_user_model
-
+from oscar.core.loading import get_model
 from oscar.views.generic import PhoneNumberMixin
 
 User = get_user_model()

src/oscar/apps/checkout/mixins.py

@@ -1,9 +1,9 @@
 import logging
 
-from django.http import HttpResponseRedirect
-from django.core.urlresolvers import reverse, NoReverseMatch
 from django.contrib.sites.models import Site, get_current_site
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.urlresolvers import NoReverseMatch, reverse
+from django.http import HttpResponseRedirect
 
 from oscar.core.loading import get_class, get_model
 

src/oscar/apps/checkout/session.py

@@ -1,13 +1,14 @@
 from decimal import Decimal as D
 
-from django.contrib import messages
 from django import http
+from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from oscar.core import prices
-from oscar.core.loading import get_model, get_class
+from oscar.core.loading import get_class, get_model
+
 from . import exceptions
 
 Repository = get_class('shipping.repository', 'Repository')

src/oscar/apps/checkout/signals.py

@@ -1,6 +1,5 @@
 from django.dispatch import Signal
 
-
 start_checkout = Signal(providing_args=["request"])
 pre_payment = Signal(providing_args=["view"])
 post_payment = Signal(providing_args=["view"])

src/oscar/apps/checkout/views.py

@@ -1,17 +1,18 @@
 import logging
 
 from django import http
-from django.shortcuts import redirect
 from django.contrib import messages
 from django.contrib.auth import login
 from django.core.urlresolvers import reverse, reverse_lazy
+from django.shortcuts import redirect
+from django.utils import six
 from django.utils.http import urlquote
 from django.utils.translation import ugettext as _
-from django.utils import six
 from django.views import generic
 
 from oscar.apps.shipping.methods import NoShippingRequired
 from oscar.core.loading import get_class, get_classes, get_model
+
 from . import signals
 
 ShippingAddressForm, GatewayForm \

src/oscar/apps/customer/abstract_models.py

@@ -1,4 +1,3 @@
-from django.utils import six
 import hashlib
 import random
 
@@ -7,9 +6,9 @@ from django.contrib.auth import models as auth_models
 from django.core.urlresolvers import reverse
 from django.core.validators import RegexValidator
 from django.db import models
-from django.template import Template, Context, TemplateDoesNotExist
+from django.template import Context, Template, TemplateDoesNotExist
 from django.template.loader import get_template
-from django.utils import timezone
+from django.utils import six, timezone
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 

src/oscar/apps/customer/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from oscar.core.loading import get_model
 
 CommunicationEventType = get_model('customer', 'CommunicationEventType')

src/oscar/apps/customer/alerts/receivers.py

@@ -1,7 +1,8 @@
 from django.conf import settings
-from oscar.core.loading import get_model
 from django.db.models.signals import post_save
 
+from oscar.core.loading import get_model
+
 
 def send_product_alerts(sender, instance, created, **kwargs):
     if kwargs.get('raw', False):

src/oscar/apps/customer/alerts/utils.py

@@ -1,10 +1,10 @@
 import logging
 
-from django.core import mail
 from django.conf import settings
-from django.template import loader, Context
 from django.contrib.sites.models import Site
+from django.core import mail
 from django.db.models import Max
+from django.template import Context, loader
 
 from oscar.apps.customer.notifications import services
 from oscar.core.loading import get_class, get_model

src/oscar/apps/customer/alerts/views.py

@@ -1,14 +1,13 @@
+from django import http
+from django.contrib import messages
 from django.http import Http404
-from django.views import generic
-from oscar.core.loading import get_model
 from django.shortcuts import get_object_or_404
-from django.contrib import messages
 from django.utils.translation import ugettext_lazy as _
-from django import http
+from django.views import generic
 
-from oscar.core.loading import get_class
 from oscar.apps.customer.alerts import utils
 from oscar.apps.customer.mixins import PageTitleMixin
+from oscar.core.loading import get_class, get_model
 
 Product = get_model('catalogue', 'Product')
 ProductAlert = get_model('customer', 'ProductAlert')

src/oscar/apps/customer/forms.py

@@ -1,5 +1,5 @@
-import string
 import random
+import string
 
 from django import forms
 from django.conf import settings
@@ -11,10 +11,9 @@ from django.utils.http import is_safe_url
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import pgettext_lazy
 
-
 from oscar.apps.customer.utils import get_password_reset_url, normalise_email
-from oscar.core.loading import get_profile_class, get_class, get_model
-from oscar.core.compat import get_user_model, existing_user_fields
+from oscar.core.compat import existing_user_fields, get_user_model
+from oscar.core.loading import get_class, get_model, get_profile_class
 from oscar.core.validators import password_validators
 from oscar.forms import widgets
 

src/oscar/apps/customer/history.py

@@ -1,7 +1,8 @@
 import json
 
 from django.conf import settings
-from oscar.core.loading import get_model, get_class
+
+from oscar.core.loading import get_class, get_model
 
 product_viewed = get_class('catalogue.signals', 'product_viewed')
 Product = get_model('catalogue', 'Product')

src/oscar/apps/customer/mixins.py

@@ -1,12 +1,13 @@
 import logging
 
 from django.conf import settings
-from django.contrib.auth import authenticate, login as auth_login
+from django.contrib.auth import login as auth_login
+from django.contrib.auth import authenticate
 from django.contrib.sites.models import get_current_site
 
-from oscar.core.loading import get_model, get_class
 from oscar.apps.customer.signals import user_registered
 from oscar.core.compat import get_user_model
+from oscar.core.loading import get_class, get_model
 
 User = get_user_model()
 CommunicationEventType = get_model('customer', 'CommunicationEventType')

src/oscar/apps/customer/models.py

@@ -1,5 +1,5 @@
-from oscar.core.loading import is_model_registered
 from oscar.apps.customer import abstract_models
+from oscar.core.loading import is_model_registered
 
 __all__ = []
 

src/oscar/apps/customer/notifications/views.py

@@ -1,13 +1,14 @@
+from django.conf import settings
+from django.contrib import messages
 from django.utils.html import strip_tags
-from django.utils.translation import ugettext_lazy as _, ungettext
 from django.utils.timezone import now
-from django.contrib import messages
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext
 from django.views import generic
-from django.conf import settings
 
+from oscar.apps.customer.mixins import PageTitleMixin
 from oscar.core.loading import get_model
 from oscar.core.utils import redirect_to_referrer
-from oscar.apps.customer.mixins import PageTitleMixin
 from oscar.views.generic import BulkEditMixin
 
 Notification = get_model('customer', 'Notification')

src/oscar/apps/customer/signals.py

@@ -1,5 +1,4 @@
 from django.dispatch import Signal
 
-
 user_registered = Signal(providing_args=["request", "user"])
 user_logged_in = Signal(providing_args=["request", "user"])

src/oscar/apps/customer/utils.py

@@ -1,11 +1,11 @@
 import logging
 
-from django.core.mail import EmailMessage, EmailMultiAlternatives
-from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.contrib.auth.tokens import default_token_generator
-from django.utils.http import urlsafe_base64_encode
+from django.core.mail import EmailMessage, EmailMultiAlternatives
+from django.core.urlresolvers import reverse
 from django.utils.encoding import force_bytes
+from django.utils.http import urlsafe_base64_encode
 
 from oscar.core.loading import get_model
 

src/oscar/apps/customer/views.py

@@ -1,20 +1,22 @@
-from django.shortcuts import get_object_or_404, redirect
-from django.views import generic
-from django.core.urlresolvers import reverse, reverse_lazy
-from django.core.exceptions import ObjectDoesNotExist
 from django import http
+from django.conf import settings
 from django.contrib import messages
-from django.utils.translation import ugettext_lazy as _
-from django.contrib.auth import logout as auth_logout, login as auth_login
+from django.contrib.auth import login as auth_login
+from django.contrib.auth import logout as auth_logout
 from django.contrib.sites.models import get_current_site
-from django.conf import settings
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.urlresolvers import reverse, reverse_lazy
+from django.shortcuts import get_object_or_404, redirect
+from django.utils.translation import ugettext_lazy as _
+from django.views import generic
 
-from oscar.core.utils import safe_referrer
-from oscar.views.generic import PostActionMixin
 from oscar.apps.customer.utils import get_password_reset_url
-from oscar.core.loading import (
-    get_class, get_profile_class, get_classes, get_model)
 from oscar.core.compat import get_user_model
+from oscar.core.loading import (
+    get_class, get_classes, get_model, get_profile_class)
+from oscar.core.utils import safe_referrer
+from oscar.views.generic import PostActionMixin
+
 from . import signals
 
 PageTitleMixin, RegisterUserMixin = get_classes(

src/oscar/apps/customer/wishlists/views.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 from django.contrib import messages
 from django.core.exceptions import (
-    ObjectDoesNotExist, MultipleObjectsReturned, PermissionDenied)
+    MultipleObjectsReturned, ObjectDoesNotExist, PermissionDenied)
 from django.core.urlresolvers import reverse
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect
-from django.views.generic import (ListView, CreateView, UpdateView, DeleteView,
-                                  View, FormView)
 from django.utils.translation import ugettext_lazy as _
+from django.views.generic import (
+    CreateView, DeleteView, FormView, ListView, UpdateView, View)
 
 from oscar.core.loading import get_class, get_classes, get_model
 from oscar.core.utils import redirect_to_referrer, safe_referrer

src/oscar/apps/dashboard/app.py

@@ -1,4 +1,4 @@
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 
 from oscar.core.application import Application
 from oscar.core.loading import get_class

src/oscar/apps/dashboard/catalogue/tables.py

@@ -1,7 +1,7 @@
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _, ungettext_lazy
-
-from django_tables2 import Column, LinkColumn, TemplateColumn, A
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext_lazy
+from django_tables2 import A, Column, LinkColumn, TemplateColumn
 
 from oscar.core.loading import get_class, get_model
 

src/oscar/apps/dashboard/catalogue/views.py

@@ -1,17 +1,15 @@
-from django.views import generic
-from django.db.models import Q
-from django.http import HttpResponseRedirect
+from django.conf import settings
 from django.contrib import messages
 from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.db.models import Q
+from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect
 from django.template.loader import render_to_string
-from django.conf import settings
-
-from oscar.core.loading import get_classes, get_model
-
+from django.utils.translation import ugettext_lazy as _
+from django.views import generic
 from django_tables2 import SingleTableMixin
 
+from oscar.core.loading import get_classes, get_model
 from oscar.views.generic import ObjectLookupView
 
 (ProductForm,

src/oscar/apps/dashboard/catalogue/widgets.py

@@ -1,6 +1,6 @@
 from django.core.urlresolvers import reverse_lazy
 
-from oscar.forms.widgets import RemoteSelect, MultipleRemoteSelect
+from oscar.forms.widgets import MultipleRemoteSelect, RemoteSelect
 
 
 class ProductSelect(RemoteSelect):

src/oscar/apps/dashboard/communications/forms.py

@@ -1,10 +1,10 @@
-from django.utils import six
-
 from django import forms
-from oscar.core.loading import get_model
 from django.template import Template, TemplateSyntaxError
+from django.utils import six
 from django.utils.translation import ugettext_lazy as _
+
 from oscar.apps.customer.utils import normalise_email
+from oscar.core.loading import get_model
 
 CommunicationEventType = get_model('customer', 'CommunicationEventType')
 Order = get_model('order', 'Order')

src/oscar/apps/dashboard/communications/views.py

@@ -1,13 +1,11 @@
-from django.utils import six
-
 from django.contrib import messages
 from django.contrib.sites.models import get_current_site
-from oscar.core.loading import get_model
 from django.template import TemplateSyntaxError
+from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 from django.views import generic
 
-from oscar.core.loading import get_class
+from oscar.core.loading import get_class, get_model
 
 CommunicationEventType = get_model('customer', 'CommunicationEventType')
 CommunicationEventTypeForm = get_class('dashboard.communications.forms',

src/oscar/apps/dashboard/menu.py

@@ -4,7 +4,6 @@ from django.utils.module_loading import import_string
 
 from oscar.core.loading import get_class
 
-
 Node = get_class('dashboard.nav', 'Node')
 
 

src/oscar/apps/dashboard/nav.py

@@ -1,8 +1,10 @@
 import re
-from django.core.urlresolvers import reverse, resolve, NoReverseMatch
+
 from django.core.exceptions import ImproperlyConfigured
+from django.core.urlresolvers import NoReverseMatch, resolve, reverse
 from django.http import Http404
-from oscar.core.loading import get_class, AppNotFoundError
+
+from oscar.core.loading import AppNotFoundError, get_class
 from oscar.views.decorators import check_permissions
 
 

src/oscar/apps/dashboard/offers/app.py

@@ -1,7 +1,7 @@
 from django.conf.urls import url
 
-from oscar.core.loading import get_class
 from oscar.core.application import Application
+from oscar.core.loading import get_class
 
 
 class OffersDashboardApplication(Application):

src/oscar/apps/dashboard/offers/forms.py

@@ -1,7 +1,7 @@
 import datetime
-from django.utils import six
 
 from django import forms
+from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
 from oscar.core.loading import get_model

src/oscar/apps/dashboard/offers/reports.py

@@ -1,6 +1,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from oscar.core.loading import get_class
+
 ReportCSVFormatter = get_class(
     'dashboard.reports.reports', 'ReportCSVFormatter')
 

src/oscar/apps/dashboard/offers/views.py

@@ -1,16 +1,16 @@
 import datetime
 import json
 
-from django.views.generic import ListView, FormView, DeleteView
-from django.core.urlresolvers import reverse
 from django.contrib import messages
+from django.core import serializers
+from django.core.serializers.json import DjangoJSONEncoder
+from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.utils.translation import ugettext_lazy as _
-from django.core import serializers
-from django.core.serializers.json import DjangoJSONEncoder
+from django.views.generic import DeleteView, FormView, ListView
 
-from oscar.core.loading import get_classes, get_class, get_model
+from oscar.core.loading import get_class, get_classes, get_model
 from oscar.views import sort_queryset
 
 ConditionalOffer = get_model('offer', 'ConditionalOffer')

src/oscar/apps/dashboard/orders/views.py

@@ -1,24 +1,25 @@
 import datetime
-from decimal import Decimal as D, InvalidOperation
+from decimal import Decimal as D
+from decimal import InvalidOperation
 
+from django.conf import settings
 from django.contrib import messages
-from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
 from django.core.exceptions import ObjectDoesNotExist
-from django.db.models import fields, Q, Sum, Count
-from django.http import HttpResponse, HttpResponseRedirect, Http404
+from django.core.urlresolvers import reverse
+from django.db.models import Q, Count, Sum, fields
+from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect
 from django.utils.datastructures import SortedDict
-from django.views.generic import ListView, DetailView, UpdateView, FormView
-from django.conf import settings
+from django.utils.translation import ugettext_lazy as _
+from django.views.generic import DetailView, FormView, ListView, UpdateView
 
-from oscar.core.loading import get_class, get_model
-from oscar.core.utils import format_datetime, datetime_combine
+from oscar.apps.order import exceptions as order_exceptions
+from oscar.apps.payment.exceptions import PaymentError
 from oscar.core.compat import UnicodeCSVWriter
+from oscar.core.loading import get_class, get_model
+from oscar.core.utils import datetime_combine, format_datetime
 from oscar.views import sort_queryset
 from oscar.views.generic import BulkEditMixin
-from oscar.apps.payment.exceptions import PaymentError
-from oscar.apps.order import exceptions as order_exceptions
 
 Partner = get_model('partner', 'Partner')
 Transaction = get_model('payment', 'Transaction')

src/oscar/apps/dashboard/pages/forms.py

@@ -1,6 +1,8 @@
 from django import forms
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import pgettext_lazy
+
 from oscar.core.loading import get_model
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 from oscar.core.validators import URLDoesNotExistValidator
 
 FlatPage = get_model('flatpages', 'FlatPage')

src/oscar/apps/dashboard/pages/views.py

@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.contrib import messages
 from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse
@@ -6,13 +7,11 @@ from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
 from django.views import generic
 from django.views.generic import ListView
-from django.conf import settings
 
+from oscar.apps.dashboard.pages import forms
 from oscar.core.loading import get_model
 from oscar.core.utils import slugify
 from oscar.core.validators import URLDoesNotExistValidator
-from oscar.apps.dashboard.pages import forms
-
 
 FlatPage = get_model('flatpages', 'FlatPage')
 Site = get_model('sites', 'Site')

src/oscar/apps/dashboard/partners/forms.py

@@ -1,10 +1,11 @@
 from django import forms
 from django.contrib.auth.models import Permission
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import pgettext_lazy
 
-from oscar.core.loading import get_model
-from oscar.core.compat import existing_user_fields, get_user_model
 from oscar.apps.customer.forms import EmailUserCreationForm
+from oscar.core.compat import existing_user_fields, get_user_model
+from oscar.core.loading import get_model
 from oscar.core.validators import password_validators
 
 User = get_user_model()

src/oscar/apps/dashboard/partners/views.py

@@ -1,14 +1,14 @@
 from django.contrib import messages
 from django.contrib.auth.models import Permission
-from django.core.urlresolvers import reverse_lazy, reverse
+from django.core.urlresolvers import reverse, reverse_lazy
 from django.shortcuts import get_object_or_404, redirect
-from django.utils.translation import ugettext_lazy as _
 from django.template.loader import render_to_string
+from django.utils.translation import ugettext_lazy as _
 from django.views import generic
 
 from oscar.apps.customer.utils import normalise_email
-from oscar.core.loading import get_classes, get_model
 from oscar.core.compat import get_user_model
+from oscar.core.loading import get_classes, get_model
 from oscar.views import sort_queryset
 
 User = get_user_model()

src/oscar/apps/dashboard/promotions/app.py

@@ -1,8 +1,8 @@
 from django.conf.urls import url
 
+from oscar.apps.promotions.conf import PROMOTION_CLASSES
 from oscar.core.application import Application
 from oscar.core.loading import get_class
-from oscar.apps.promotions.conf import PROMOTION_CLASSES
 
 
 class PromotionsDashboardApplication(Application):

src/oscar/apps/dashboard/promotions/forms.py

@@ -2,10 +2,10 @@ from django import forms
 from django.conf import settings
 from django.forms.models import inlineformset_factory
 from django.utils.translation import ugettext_lazy as _
-from oscar.apps.promotions.conf import PROMOTION_CLASSES
 
+from oscar.apps.promotions.conf import PROMOTION_CLASSES
+from oscar.core.loading import get_class, get_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',

src/oscar/apps/dashboard/promotions/views.py

@@ -1,17 +1,17 @@
 import itertools
 
-from django.views import generic
-from django.contrib.contenttypes.models import ContentType
-from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.contrib import messages
-from django.http import HttpResponseRedirect
+from django.contrib.contenttypes.models import ContentType
+from django.core.urlresolvers import reverse
 from django.db.models import Count
+from django.http import HttpResponseRedirect
 from django.shortcuts import HttpResponse
+from django.utils.translation import ugettext_lazy as _
+from django.views import generic
 
-from oscar.core.loading import get_classes
 from oscar.apps.promotions.conf import PROMOTION_CLASSES
+from oscar.core.loading import get_classes
 
 SingleProduct, RawHTML, Image, MultiImage, AutomaticProductList, \
     PagePromotion, HandPickedProductList \

src/oscar/apps/dashboard/ranges/views.py

@@ -5,15 +5,15 @@ from django.contrib import messages
 from django.core import exceptions
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
-from django.shortcuts import get_object_or_404, HttpResponse
+from django.shortcuts import HttpResponse, get_object_or_404
 from django.template.loader import render_to_string
-from django.utils.translation import ungettext, ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext
 from django.views.generic import (
-    ListView, DeleteView, CreateView, UpdateView, View)
+    CreateView, DeleteView, ListView, UpdateView, View)
 
-
-from oscar.views.generic import BulkEditMixin
 from oscar.core.loading import get_classes, get_model
+from oscar.views.generic import BulkEditMixin
 
 Range = get_model('offer', 'Range')
 RangeProduct = get_model('offer', 'RangeProduct')

src/oscar/apps/dashboard/reports/forms.py

@@ -2,6 +2,7 @@ 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')
 

src/oscar/apps/dashboard/reports/reports.py

@@ -1,8 +1,8 @@
 from datetime import datetime, time
 
 from django.http import HttpResponse
-from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone
+from django.utils.translation import ugettext_lazy as _
 
 from oscar.core import utils
 from oscar.core.compat import UnicodeCSVWriter

src/oscar/apps/dashboard/reports/utils.py

@@ -1,4 +1,5 @@
 from oscar.core.loading import get_class, get_classes
+
 OrderReportGenerator = get_class('order.reports', 'OrderReportGenerator')
 ProductReportGenerator, UserReportGenerator \
     = get_classes('analytics.reports', ['ProductReportGenerator',

src/oscar/apps/dashboard/reports/views.py

@@ -1,10 +1,11 @@
-from django.http import HttpResponseForbidden, Http404
+from django.conf import settings
+from django.http import Http404, HttpResponseForbidden
 from django.template.response import TemplateResponse
-from django.views.generic import ListView
 from django.utils.translation import ugettext_lazy as _
-from django.conf import settings
+from django.views.generic import ListView
 
 from oscar.core.loading import get_class
+
 ReportForm = get_class('dashboard.reports.forms', 'ReportForm')
 GeneratorRepository = get_class('dashboard.reports.utils',
                                 'GeneratorRepository')

src/oscar/apps/dashboard/reviews/forms.py

@@ -1,7 +1,8 @@
 from django import forms
-from oscar.core.loading import get_model
 from django.utils.translation import ugettext_lazy as _
 
+from oscar.core.loading import get_model
+
 ProductReview = get_model('reviews', 'productreview')
 
 

src/oscar/apps/dashboard/reviews/utils.py

@@ -1,4 +1,5 @@
 from oscar.core.loading import get_class, get_classes
+
 OrderReportGenerator = get_class('order.reports', 'OrderReportGenerator')
 ProductReportGenerator, UserReportGenerator \
     = get_classes('analytics.reports', ['ProductReportGenerator',

src/oscar/apps/dashboard/reviews/views.py

@@ -1,17 +1,17 @@
 import datetime
 
-from django.views import generic
 from django.conf import settings
-from django.db.models import Q
-from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
+from django.db.models import Q
 from django.http import HttpResponseRedirect
+from django.utils.translation import ugettext_lazy as _
+from django.views import generic
 
-from oscar.views.generic import BulkEditMixin
 from oscar.apps.dashboard.reviews import forms
-from oscar.core.utils import format_datetime
 from oscar.core.loading import get_model
+from oscar.core.utils import format_datetime
 from oscar.views import sort_queryset
+from oscar.views.generic import BulkEditMixin
 
 ProductReview = get_model('reviews', 'productreview')
 

src/oscar/apps/dashboard/shipping/views.py

@@ -4,7 +4,7 @@ from django.core.urlresolvers import reverse
 from django.template.loader import render_to_string
 from django.views import generic
 
-from oscar.core.loading import get_model, get_classes
+from oscar.core.loading import get_classes, get_model
 
 WeightBandForm, WeightBasedForm = get_classes(
     'dashboard.shipping.forms', ['WeightBandForm', 'WeightBasedForm'])

src/oscar/apps/dashboard/tables.py

@@ -1,5 +1,4 @@
 from django.utils.translation import ungettext_lazy
-
 from django_tables2 import Table
 
 

src/oscar/apps/dashboard/users/forms.py

@@ -1,8 +1,9 @@
 from django import forms
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import pgettext_lazy
 
-from oscar.core.loading import get_model
 from oscar.core.compat import get_user_model
+from oscar.core.loading import get_model
 
 User = get_user_model()
 ProductAlert = get_model('customer', 'ProductAlert')

src/oscar/apps/dashboard/users/tables.py

@@ -1,4 +1,4 @@
-from django_tables2 import LinkColumn, TemplateColumn, Column, A
+from django_tables2 import A, Column, LinkColumn, TemplateColumn
 
 from oscar.core.loading import get_class
 

src/oscar/apps/dashboard/users/views.py

@@ -1,20 +1,19 @@
-from django.db.models import Q
 from django.conf import settings
 from django.contrib import messages
+from django.core.urlresolvers import reverse
+from django.db.models import Q
 from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
-from django.views.generic import ListView, DetailView, DeleteView, \
-    UpdateView, FormView, TemplateView
+from django.views.generic import (
+    DeleteView, DetailView, FormView, ListView, TemplateView, UpdateView)
 from django.views.generic.detail import SingleObjectMixin
 from django.views.generic.edit import FormMixin
-
 from django_tables2 import SingleTableMixin
 
 from oscar.apps.customer.utils import normalise_email
-from oscar.views.generic import BulkEditMixin
 from oscar.core.compat import get_user_model
 from oscar.core.loading import get_class, get_classes, get_model
+from oscar.views.generic import BulkEditMixin
 
 UserSearchForm, ProductAlertSearchForm, ProductAlertUpdateForm = get_classes(
     'dashboard.users.forms', ('UserSearchForm', 'ProductAlertSearchForm',

src/oscar/apps/dashboard/views.py

@@ -1,13 +1,14 @@
 from datetime import timedelta
-from decimal import Decimal as D, ROUND_UP
+from decimal import Decimal as D
+from decimal import ROUND_UP
 
+from django.db.models import Avg, Count, Sum
 from django.utils.timezone import now
 from django.views.generic import TemplateView
-from oscar.core.loading import get_model
-from django.db.models import Avg, Sum, Count
 
-from oscar.core.compat import get_user_model
 from oscar.apps.promotions.models import AbstractPromotion
+from oscar.core.compat import get_user_model
+from oscar.core.loading import get_model
 
 ConditionalOffer = get_model('offer', 'ConditionalOffer')
 Voucher = get_model('voucher', 'Voucher')

src/oscar/apps/dashboard/vouchers/views.py

@@ -1,5 +1,3 @@
-import datetime
-
 from django.conf import settings
 from django.contrib import messages
 from django.core.urlresolvers import reverse
@@ -8,7 +6,7 @@ from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 from django.views import generic
 
-from oscar.core.loading import get_model, get_class
+from oscar.core.loading import get_class, get_model
 from oscar.views import sort_queryset
 
 VoucherForm = get_class('dashboard.vouchers.forms', 'VoucherForm')

src/oscar/apps/offer/abstract_models.py

@@ -1,28 +1,28 @@
 import itertools
-import os
 import operator
+import os
 import re
-from decimal import Decimal as D, ROUND_DOWN
+from decimal import Decimal as D
+from decimal import ROUND_DOWN
 
-from django.db import models
-from django.db.models.query import Q
+from django.conf import settings
 from django.core import exceptions
 from django.core.urlresolvers import reverse
+from django.db import models
+from django.db.models.query import Q
 from django.template.defaultfilters import date as date_filter
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.functional import cached_property
-from django.utils.timezone import now, get_current_timezone
+from django.utils.timezone import get_current_timezone, now
 from django.utils.translation import ugettext_lazy as _
-from django.conf import settings
 
 from oscar.apps.offer import results, utils
 from oscar.apps.offer.managers import ActiveOfferManager
 from oscar.core.compat import AUTH_USER_MODEL
-from oscar.core.loading import get_model, get_class
+from oscar.core.loading import get_class, get_model
 from oscar.models import fields
 from oscar.templatetags.currency_filters import currency
 
-
 BrowsableRangeManager = get_class('offer.managers', 'BrowsableRangeManager')
 
 

src/oscar/apps/offer/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from oscar.core.loading import get_model
 
 ConditionalOffer = get_model('offer', 'ConditionalOffer')

src/oscar/apps/offer/applicator.py

@@ -1,11 +1,11 @@
-from itertools import chain
 import logging
+from itertools import chain
 
 from django.db.models import Q
 from django.utils.timezone import now
 
-from oscar.core.loading import get_model
 from oscar.apps.offer import results
+from oscar.core.loading import get_model
 
 logger = logging.getLogger('oscar.offers')
 

src/oscar/apps/offer/benefits.py

@@ -1,11 +1,11 @@
 from decimal import Decimal as D
+
 from django.utils.translation import ugettext_lazy as _
 
 from oscar.apps.offer import conditions, results, utils
 from oscar.core.loading import get_model
 from oscar.templatetags.currency_filters import currency
 
-
 Benefit = get_model('offer', 'Benefit')
 
 __all__ = [

src/oscar/apps/offer/conditions.py

@@ -1,13 +1,14 @@
-from decimal import Decimal as D, ROUND_UP
+from decimal import Decimal as D
+from decimal import ROUND_UP
 
 from django.utils import six
-from django.utils.translation import ungettext, ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext
 
 from oscar.apps.offer import utils
 from oscar.core.loading import get_model
 from oscar.templatetags.currency_filters import currency
 
-
 Condition = get_model('offer', 'Condition')
 
 __all__ = [

src/oscar/apps/offer/custom.py

@@ -1,7 +1,7 @@
 from django.core import exceptions
 from django.db import IntegrityError
 
-from oscar.apps.offer.models import Condition, Benefit
+from oscar.apps.offer.models import Benefit, Condition
 from oscar.core.loading import get_model
 
 Range = get_model('offer', 'Range')

src/oscar/apps/offer/managers.py

@@ -1,5 +1,5 @@
-from django.utils.timezone import now
 from django.db import models
+from django.utils.timezone import now
 
 
 class ActiveOfferManager(models.Manager):

src/oscar/apps/offer/models.py

@@ -1,11 +1,10 @@
-from oscar.core.loading import is_model_registered
-from oscar.apps.offer.results import (
-    BasketDiscount, ShippingDiscount, PostOrderAction,
-    SHIPPING_DISCOUNT, ZERO_DISCOUNT)
 from oscar.apps.offer.abstract_models import (
     AbstractBenefit, AbstractCondition, AbstractConditionalOffer,
     AbstractRange, AbstractRangeProduct, AbstractRangeProductFileUpload)
-
+from oscar.apps.offer.results import (
+    SHIPPING_DISCOUNT, ZERO_DISCOUNT, BasketDiscount, PostOrderAction,
+    ShippingDiscount)
+from oscar.core.loading import is_model_registered
 
 __all__ = [
     'BasketDiscount', 'ShippingDiscount', 'PostOrderAction',
@@ -58,11 +57,11 @@ if not is_model_registered('offer', 'RangeProductFileUpload'):
 # Import the benefits and the conditions. Required after initializing the
 # parent models to allow overriding them
 
-from oscar.apps.offer.benefits import *  # noqa
-from oscar.apps.offer.conditions import *  # noqa
+from oscar.apps.offer.benefits import *  # noqa isort:skip
+from oscar.apps.offer.conditions import *  # noqa isort:skip
 
-from oscar.apps.offer.benefits import __all__ as benefit_classes  # noqa
-from oscar.apps.offer.conditions import __all__ as condition_classes  # noqa
+from oscar.apps.offer.benefits import __all__ as benefit_classes  # noqa isort:skip
+from oscar.apps.offer.conditions import __all__ as condition_classes  # noqa isort:skip
 
 __all__.extend(benefit_classes)
 __all__.extend(condition_classes)

src/oscar/apps/offer/reports.py

@@ -3,8 +3,7 @@ from decimal import Decimal as D
 
 from django.utils.translation import ugettext_lazy as _
 
-from oscar.core.loading import get_model, get_class
-
+from oscar.core.loading import get_class, get_model
 
 ReportGenerator = get_class('dashboard.reports.reports', 'ReportGenerator')
 ReportCSVFormatter = get_class('dashboard.reports.reports',

src/oscar/apps/offer/views.py

@@ -1,7 +1,7 @@
-from django.views.generic import ListView
 from django import http
 from django.conf import settings
 from django.shortcuts import get_object_or_404
+from django.views.generic import ListView
 
 from oscar.core.loading import get_model
 

src/oscar/apps/order/abstract_models.py

@@ -1,19 +1,21 @@
+import hashlib
 from collections import OrderedDict
 from decimal import Decimal as D
-import hashlib
 
 from django.conf import settings
 from django.db import models
 from django.db.models import Sum
 from django.utils import timezone
-from django.utils.encoding import python_2_unicode_compatible
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 from django.utils.datastructures import SortedDict
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.timezone import now
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import pgettext_lazy
 
-from oscar.core.utils import get_default_currency
 from oscar.core.compat import AUTH_USER_MODEL
+from oscar.core.utils import get_default_currency
 from oscar.models.fields import AutoSlugField
+
 from . import exceptions
 
 

src/oscar/apps/order/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from oscar.core.loading import get_model
 
 Order = get_model('order', 'Order')

src/oscar/apps/order/models.py

@@ -1,7 +1,7 @@
-from oscar.core.loading import is_model_registered
+from oscar.apps.address.abstract_models import (
+    AbstractBillingAddress, AbstractShippingAddress)
 from oscar.apps.order.abstract_models import *  # noqa
-from oscar.apps.address.abstract_models import (AbstractShippingAddress,
-                                                AbstractBillingAddress)
+from oscar.core.loading import is_model_registered
 
 __all__ = ['PaymentEventQuantity', 'ShippingEventQuantity']
 

src/oscar/apps/order/processing.py

@@ -2,8 +2,8 @@ from decimal import Decimal as D
 
 from django.utils.translation import ugettext_lazy as _
 
-from oscar.core.loading import get_model
 from oscar.apps.order import exceptions
+from oscar.core.loading import get_model
 
 ShippingEventQuantity = get_model('order', 'ShippingEventQuantity')
 PaymentEventQuantity = get_model('order', 'PaymentEventQuantity')