Apply isort fixes on the whole project.

setup.cfg

@@ -17,4 +17,4 @@ multi_line_output = 4
 balanced_wrapping = true
 known_first_party = oscar,tests
 use_parentheses = true
-skip_glob=*/src/oscar/**/migrations/*.py,*/tests/**/*.py
+skip_glob=*/migrations/*

src/oscar/apps/basket/reports.py

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

src/oscar/apps/catalogue/abstract_models.py

@@ -16,8 +16,9 @@ from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.html import strip_tags
 from django.utils.safestring import mark_safe
+from django.utils.translation import get_language
 from django.utils.translation import gettext_lazy as _
-from django.utils.translation import get_language, pgettext_lazy
+from django.utils.translation import pgettext_lazy
 from treebeard.mp_tree import MP_Node
 
 from oscar.core.loading import get_class, get_model

src/oscar/apps/catalogue/managers.py

@@ -1,7 +1,7 @@
 from collections import defaultdict
 
 from django.db import models
-from django.db.models import OuterRef, Exists
+from django.db.models import Exists, OuterRef
 from django.db.models.constants import LOOKUP_SEP
 
 from oscar.core.decorators import deprecated

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

@@ -10,7 +10,6 @@ from oscar.core import validators
 from oscar.core.compat import AUTH_USER_MODEL
 from oscar.core.loading import get_class
 
-
 ProductReviewQuerySet = get_class('catalogue.reviews.managers', 'ProductReviewQuerySet')
 
 

src/oscar/apps/customer/abstract_models.py

@@ -14,7 +14,6 @@ from oscar.core.compat import AUTH_USER_MODEL
 from oscar.core.loading import get_class
 from oscar.models.fields import AutoSlugField
 
-
 CommunicationTypeManager = get_class('customer.managers', 'CommunicationTypeManager')
 
 

src/oscar/apps/customer/forms.py

@@ -13,8 +13,7 @@ from django.utils.translation import gettext_lazy as _
 from django.utils.translation import pgettext_lazy
 
 from oscar.apps.customer.utils import get_password_reset_url, normalise_email
-from oscar.core.compat import (
-    existing_user_fields, get_user_model)
+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.forms import widgets
 

src/oscar/apps/customer/mixins.py

@@ -1,8 +1,8 @@
 import logging
 
 from django.conf import settings
-from django.contrib.auth import login as auth_login
 from django.contrib.auth import authenticate
+from django.contrib.auth import login as auth_login
 from django.contrib.sites.shortcuts import get_current_site
 
 from oscar.apps.customer.signals import user_registered

src/oscar/apps/customer/utils.py

@@ -9,7 +9,6 @@ from django.utils.encoding import force_bytes
 from oscar.core.compat import urlsafe_base64_encode
 from oscar.core.loading import get_model
 
-
 CommunicationEvent = get_model('order', 'CommunicationEvent')
 Email = get_model('customer', 'Email')
 

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

@@ -3,7 +3,7 @@ from django.core import exceptions
 from django.utils.translation import gettext_lazy as _
 from treebeard.forms import movenodeform_factory
 
-from oscar.core.loading import get_class, get_model, get_classes
+from oscar.core.loading import get_class, get_classes, get_model
 from oscar.core.utils import slugify
 from oscar.forms.widgets import DateTimePickerInput, ImageInput
 

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

@@ -12,7 +12,6 @@ from django_tables2 import SingleTableMixin, SingleTableView
 from oscar.core.loading import get_classes, get_model
 from oscar.views.generic import ObjectLookupView
 
-
 (ProductForm,
  ProductClassSelectForm,
  ProductSearchForm,

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

@@ -1,8 +1,8 @@
 from datetime import datetime, time
 
-from django.utils import timezone
 from django.http import HttpResponse
 from django.template.defaultfilters import date
+from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
 from oscar.core import utils

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

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

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

@@ -1,5 +1,4 @@
 from django.utils.translation import gettext_lazy as _
-
 from django_tables2 import A, Column, LinkColumn, TemplateColumn
 
 from oscar.core.loading import get_class

src/oscar/apps/dashboard/views.py

@@ -1,7 +1,7 @@
 import json
 from datetime import timedelta
-from decimal import Decimal as D
 from decimal import ROUND_UP
+from decimal import Decimal as D
 
 from django.contrib import messages
 from django.db.models import Avg, Count, Sum

src/oscar/apps/offer/abstract_models.py

@@ -1,16 +1,16 @@
 import operator
 import os
 import re
-from decimal import Decimal as D
 from decimal import ROUND_DOWN
+from decimal import Decimal as D
 
 from django.conf import settings
 from django.core import exceptions
 from django.db import models
-from django.db.models.lookups import StartsWith
+from django.db.models import Exists, OuterRef
 from django.db.models.fields import Field
+from django.db.models.lookups import StartsWith
 from django.db.models.query import Q
-from django.db.models import OuterRef, Exists
 from django.template.defaultfilters import date as date_filter
 from django.urls import reverse
 from django.utils.functional import cached_property
@@ -19,7 +19,8 @@ from django.utils.translation import gettext_lazy as _
 
 from oscar.core.compat import AUTH_USER_MODEL
 from oscar.core.decorators import deprecated
-from oscar.core.loading import get_class, get_classes, get_model, cached_import_string
+from oscar.core.loading import (
+    cached_import_string, get_class, get_classes, get_model)
 from oscar.models import fields
 from oscar.templatetags.currency_filters import currency
 

src/oscar/apps/offer/conditions.py

@@ -1,5 +1,5 @@
-from decimal import Decimal as D
 from decimal import ROUND_UP
+from decimal import Decimal as D
 
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ungettext

src/oscar/apps/offer/managers.py

@@ -1,5 +1,6 @@
 from django.db import models
 from django.utils.timezone import now
+
 from .queryset import RangeQuerySet
 
 

src/oscar/apps/offer/queryset.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.db.models import OuterRef, Exists
+from django.db.models import Exists, OuterRef
 
 
 def product_class_as_queryset(product):

src/oscar/apps/order/abstract_models.py

@@ -25,7 +25,6 @@ from oscar.utils.deprecation import RemovedInOscar21Warning
 
 from . import exceptions
 
-
 logger = logging.getLogger('oscar.order')
 
 

src/oscar/core/application.py

@@ -4,7 +4,6 @@ from django.urls import reverse_lazy
 
 from oscar.core.loading import feature_hidden
 
-
 try:
     # Django 2
     from django.urls import URLPattern

src/oscar/core/compat.py

@@ -3,11 +3,11 @@ import csv
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.http import urlsafe_base64_encode as django_urlsafe_base64_encode
+from django.utils.http import (
+    urlsafe_base64_encode as django_urlsafe_base64_encode)
 
 from oscar.core.loading import get_model
 
-
 # A setting that can be used in foreign key declarations
 AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
 try:

src/oscar/core/utils.py

@@ -5,16 +5,14 @@ import re
 import unicodedata
 
 from babel.dates import format_timedelta as format_td
-
 from django.conf import settings
 from django.shortcuts import redirect, resolve_url
-from django.utils.translation import get_language, to_locale
 from django.template.defaultfilters import date as date_filter
 from django.utils.http import is_safe_url
 from django.utils.module_loading import import_string
 from django.utils.text import slugify as django_slugify
 from django.utils.timezone import get_current_timezone, is_naive, make_aware
-
+from django.utils.translation import get_language, to_locale
 
 SLUGIFY_RE = re.compile(r'[^\w\s-]', re.UNICODE)
 

src/oscar/core/validators.py

@@ -4,8 +4,10 @@ from django.conf.urls.i18n import is_language_prefix_patterns_used
 from django.core import validators
 from django.core.exceptions import ValidationError
 from django.http import Http404
-from django.urls import resolve, get_urlconf
-from django.utils.translation import gettext_lazy as _, get_language_from_path, get_language, override
+from django.urls import get_urlconf, resolve
+from django.utils.translation import get_language, get_language_from_path
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import override
 
 from oscar.core.loading import get_model
 

src/oscar/templatetags/category_tags.py

@@ -1,5 +1,6 @@
-from six import with_metaclass
 from django import template
+from six import with_metaclass
+
 from oscar.core.loading import get_model
 
 register = template.Library()

src/oscar/templatetags/datetime_filters.py

@@ -1,6 +1,6 @@
 from django import template
-from oscar.core.utils import format_timedelta
 
+from oscar.core.utils import format_timedelta
 
 register = template.Library()
 

src/oscar/templatetags/purchase_info_tags.py

@@ -1,6 +1,5 @@
 from django import template
 
-
 register = template.Library()
 
 

src/oscar/test/factories/__init__.py

@@ -1,7 +1,7 @@
 # coding=utf-8
-from decimal import Decimal as D
-import random
 import datetime
+import random
+from decimal import Decimal as D
 
 from django.conf import settings
 from django.utils import timezone
@@ -20,7 +20,6 @@ from oscar.test.factories.payment import *  # noqa
 from oscar.test.factories.voucher import *  # noqa
 from oscar.test.factories.wishlists import *  # noqa
 
-
 Basket = get_model('basket', 'Basket')
 Free = get_class('shipping.methods', 'Free')
 Voucher = get_model('voucher', 'Voucher')

src/oscar/test/factories/utils.py

@@ -1,5 +1,5 @@
-from decimal import Decimal as D
 from decimal import ROUND_HALF_UP
+from decimal import Decimal as D
 
 
 def tax_subtract(price, tax_percentage=21):

src/oscar/test/factories/voucher.py

@@ -6,7 +6,6 @@ from django.utils.timezone import now
 from oscar.core.loading import get_model
 from oscar.test.factories import ConditionalOfferFactory
 
-
 __all__ = ['VoucherFactory', 'VoucherSetFactory']
 
 

src/oscar/test/utils.py

@@ -1,22 +1,21 @@
-import queue
 import os
+import queue
 import shutil
 import threading
 from datetime import date
 
-from django.contrib.auth.models import AnonymousUser
 from django.conf import settings
+from django.contrib.auth.models import AnonymousUser
 from django.contrib.messages.storage.fallback import FallbackStorage
 from django.contrib.sessions.backends.db import SessionStore
 from django.core.signing import Signer
 from django.db import connection
 from django.test import RequestFactory as BaseRequestFactory
+from sorl.thumbnail.conf import settings as sorl_settings
 
 from oscar.core.loading import get_class, get_model
 from oscar.core.thumbnails import get_thumbnailer
 from oscar.test.factories import ProductImageFactory
-from sorl.thumbnail.conf import settings as sorl_settings
-
 
 OSCAR_IMAGE_FOLDER_FORMATTED = 'images/products/{0}/{1:02d}/'.format(date.today().year, date.today().month)
 FULL_PATH_TO_IMAGES_FOLDER = os.path.join(settings.MEDIA_ROOT, OSCAR_IMAGE_FOLDER_FORMATTED)

tests/_site/apps/catalogue/views.py

@@ -1,4 +1,5 @@
-from oscar.apps.catalogue.views import ProductDetailView as OscarProductDetailView
+from oscar.apps.catalogue.views import (
+    ProductDetailView as OscarProductDetailView)
 
 
 class ParentProductDetailView(OscarProductDetailView):

tests/_site/apps/customer/views.py

@@ -1,4 +1,5 @@
-from oscar.apps.customer.views import AccountSummaryView as OscarAccountSummaryView
+from oscar.apps.customer.views import (
+    AccountSummaryView as OscarAccountSummaryView)
 
 
 class AccountSummaryView(OscarAccountSummaryView):

tests/_site/apps/partner/models.py

@@ -8,4 +8,4 @@ class StockRecord(abstract_models.AbstractStockRecord):
     offer_name = models.CharField(max_length=128, null=True, blank=True)
 
 
-from oscar.apps.partner.models import *  # noqa
+from oscar.apps.partner.models import *  # noqa isort:skip

tests/_site/myauth/models.py

@@ -2,10 +2,10 @@
 
 import re
 
-from django.utils.translation import gettext_lazy as _
-from django.db import models
-from django.core import validators
 from django.contrib.auth.models import BaseUserManager
+from django.core import validators
+from django.db import models
+from django.utils.translation import gettext_lazy as _
 
 from oscar.apps.customer.abstract_models import AbstractUser
 

tests/_site/urls.py

@@ -1,5 +1,5 @@
 from django.apps import apps
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 from django.conf.urls.i18n import i18n_patterns
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns

tests/functional/basket/test_manipulation.py

@@ -1,6 +1,6 @@
-from oscar.test.testcases import WebTestCase
-from oscar.test import factories
 from oscar.apps.basket import models
+from oscar.test import factories
+from oscar.test.testcases import WebTestCase
 
 
 class TestAddingToBasket(WebTestCase):

tests/functional/catalogue/test_review.py

@@ -1,8 +1,9 @@
 from django.urls import reverse
-from oscar.test.testcases import WebTestCase
-from oscar.test.factories import create_product, UserFactory
+
 from oscar.apps.catalogue.reviews.signals import review_added
 from oscar.test.contextmanagers import mock_signal_receiver
+from oscar.test.factories import UserFactory, create_product
+from oscar.test.testcases import WebTestCase
 
 
 class TestACustomer(WebTestCase):

tests/functional/checkout/__init__.py

@@ -2,7 +2,7 @@ from decimal import Decimal as D
 
 from django.urls import reverse
 
-from oscar.core.loading import get_model, get_class
+from oscar.core.loading import get_class, get_model
 from oscar.test import factories
 
 UserAddress = get_model('address', 'UserAddress')

tests/functional/checkout/test_customer_checkout.py

@@ -3,9 +3,10 @@ from unittest.mock import patch
 
 from django.urls import reverse
 
-from oscar.core.loading import get_model, get_class
+from oscar.core.loading import get_class, get_model
 from oscar.test import factories
 from oscar.test.testcases import WebTestCase
+
 from . import CheckoutMixin
 
 Order = get_model('order', 'Order')

tests/functional/checkout/test_guest_checkout.py

@@ -1,18 +1,19 @@
-from importlib import import_module
+import sys
 from http import client as http_client
+from importlib import import_module
 from unittest import mock
-import sys
 
-from django.test.utils import override_settings
 from django.conf import settings
+from django.test.utils import override_settings
 from django.urls import clear_url_caches, reverse
 from django.utils.http import urlquote
 
+from oscar.apps.shipping import methods
 from oscar.core.compat import get_user_model
 from oscar.core.loading import get_class, get_classes, get_model
-from oscar.apps.shipping import methods
-from oscar.test.testcases import WebTestCase
 from oscar.test import factories
+from oscar.test.testcases import WebTestCase
+
 from . import CheckoutMixin
 
 GatewayForm = get_class('checkout.forms', 'GatewayForm')

tests/functional/customer/test_alert.py

@@ -1,18 +1,17 @@
 from unittest import mock
 
-from django_webtest import WebTest
-
 from django.contrib.auth.models import AnonymousUser
-from django.urls import reverse
 from django.core import mail
 from django.test import TestCase
+from django.urls import reverse
+from django_webtest import WebTest
 
 from oscar.apps.customer.alerts.utils import (
     send_alert_confirmation, send_product_alerts)
 from oscar.apps.customer.forms import ProductAlertForm
 from oscar.apps.customer.models import ProductAlert
 from oscar.test.factories import (
-    create_product, create_stockrecord, ProductAlertFactory, UserFactory)
+    ProductAlertFactory, UserFactory, create_product, create_stockrecord)
 
 
 class TestAUser(WebTest):

tests/functional/customer/test_auth.py

@@ -4,10 +4,9 @@ from django.core import mail
 from django.urls import reverse
 from django_webtest import WebTest
 
-from oscar.test.testcases import WebTestCase
-from oscar.test import factories
 from oscar.core.compat import get_user_model
-
+from oscar.test import factories
+from oscar.test.testcases import WebTestCase
 
 User = get_user_model()
 

tests/functional/customer/test_history.py

@@ -10,7 +10,6 @@ from oscar.templatetags.history_tags import get_back_button
 from oscar.test.factories import create_product
 from oscar.test.testcases import WebTestCase
 
-
 User = get_user_model()
 COOKIE_NAME = settings.OSCAR_RECENTLY_VIEWED_COOKIE_NAME
 

tests/functional/customer/test_notification.py

@@ -1,11 +1,11 @@
 from http import client as http_client
 
-from oscar.test.testcases import WebTestCase
-from oscar.apps.customer.notifications import services
-from oscar.test.factories import UserFactory
 from django.urls import reverse
 
 from oscar.apps.customer.models import Notification
+from oscar.apps.customer.notifications import services
+from oscar.test.factories import UserFactory
+from oscar.test.testcases import WebTestCase
 
 
 class TestAUserWithUnreadNotifications(WebTestCase):

tests/functional/customer/test_profile.py

@@ -3,13 +3,12 @@ from unittest.mock import patch
 
 from django.urls import reverse
 
-from oscar.test.factories import create_product, create_order
-from oscar.test.testcases import WebTestCase
-from oscar.core.compat import get_user_model
 from oscar.apps.basket.models import Basket
-from oscar.apps.partner import strategy
 from oscar.apps.order.models import Order
-
+from oscar.apps.partner import strategy
+from oscar.core.compat import get_user_model
+from oscar.test.factories import create_order, create_product
+from oscar.test.testcases import WebTestCase
 
 User = get_user_model()
 

tests/functional/customer/test_wishlists.py

@@ -2,8 +2,7 @@
 from django.urls import reverse_lazy
 
 from oscar.core.loading import get_model
-
-from oscar.test.factories import create_product, WishListFactory
+from oscar.test.factories import WishListFactory, create_product
 from oscar.test.testcases import WebTestCase
 
 WishList = get_model('wishlists', 'WishList')

tests/functional/dashboard/test_catalogue.py

@@ -1,13 +1,13 @@
 from http import client as http_client
+
 from django.urls import reverse
 
 from oscar.core.loading import get_class, get_model
 from oscar.test.factories import (
-    CategoryFactory, PartnerFactory, ProductAttributeFactory,
-    ProductFactory, create_product)
+    CategoryFactory, PartnerFactory, ProductAttributeFactory, ProductFactory,
+    create_product)
 from oscar.test.testcases import WebTestCase, add_permissions
 
-
 Product = get_model('catalogue', 'Product')
 ProductClass = get_model('catalogue', 'ProductClass')
 ProductCategory = get_model('catalogue', 'ProductCategory')

tests/functional/dashboard/test_catalogue_option.py

@@ -6,10 +6,10 @@ from oscar.core.loading import get_class, get_model
 from oscar.test.factories import (
     OptionFactory, ProductClassFactory, create_product)
 from oscar.test.testcases import WebTestCase
-from .testcases import (
-    ListViewMixin, PopUpObjectCreateMixin,
-    PopUpObjectUpdateMixin, PopUpObjectDeleteMixin)
 
+from .testcases import (
+    ListViewMixin, PopUpObjectCreateMixin, PopUpObjectDeleteMixin,
+    PopUpObjectUpdateMixin)
 
 Option = get_model('catalogue', 'Option')
 OptionForm = get_class('dashboard.catalogue.forms', 'OptionForm')

tests/functional/dashboard/test_catalogue_option_group.py

@@ -1,14 +1,15 @@
 from django.contrib.messages import ERROR
 from django.utils.translation import gettext
+
 from oscar.core.loading import get_class, get_model
-from oscar.test.testcases import WebTestCase
 from oscar.test.factories import (
-    AttributeOptionFactory,
-    AttributeOptionGroupFactory, ProductAttributeFactory)
-from .testcases import (
-    ListViewMixin, PopUpObjectCreateMixin,
-    PopUpObjectUpdateMixin, PopUpObjectDeleteMixin)
+    AttributeOptionFactory, AttributeOptionGroupFactory,
+    ProductAttributeFactory)
+from oscar.test.testcases import WebTestCase
 
+from .testcases import (
+    ListViewMixin, PopUpObjectCreateMixin, PopUpObjectDeleteMixin,
+    PopUpObjectUpdateMixin)
 
 AttributeOptionGroup = get_model('catalogue', 'AttributeOptionGroup')
 AttributeOption = get_model('catalogue', 'AttributeOption')

tests/functional/dashboard/test_category.py

@@ -1,9 +1,9 @@
 from django.urls import reverse
 
-from oscar.test.testcases import WebTestCase
-from oscar.apps.catalogue.models import Category
 from oscar.apps.catalogue.categories import create_from_breadcrumbs
+from oscar.apps.catalogue.models import Category
 from oscar.test.factories import UserFactory
+from oscar.test.testcases import WebTestCase
 
 
 class TestCategoryDashboard(WebTestCase):

tests/functional/dashboard/test_dashboard.py

@@ -2,12 +2,13 @@ from decimal import Decimal as D
 
 from django.urls import reverse
 
-from oscar.core import prices
-from oscar.core.loading import get_model
 from oscar.apps.dashboard.views import IndexView
 from oscar.apps.order.models import Order
+from oscar.core import prices
+from oscar.core.loading import get_model
+from oscar.test.factories import (
+    UserFactory, create_basket, create_order, create_product)
 from oscar.test.testcases import WebTestCase
-from oscar.test.factories import create_order, create_product, create_basket, UserFactory
 
 StockAlert = get_model('partner', 'StockAlert')
 

tests/functional/dashboard/test_offer.py

@@ -1,8 +1,8 @@
 from django.urls import reverse
 from django.utils import timezone
 
-from oscar.test import testcases, factories
 from oscar.apps.offer import models
+from oscar.test import factories, testcases
 
 
 class TestAnAdmin(testcases.WebTestCase):

tests/functional/dashboard/test_order.py

@@ -3,14 +3,13 @@ from http import client as http_client
 from django.conf import settings
 from django.urls import reverse
 
-from oscar.core.loading import get_model
 from oscar.apps.order.models import (
     Order, OrderNote, PaymentEvent, PaymentEventType)
-from oscar.test.factories import PartnerFactory, ShippingAddressFactory
-from oscar.test.factories import create_order, create_basket
+from oscar.core.loading import get_model
+from oscar.test.factories import (
+    PartnerFactory, ShippingAddressFactory, SourceTypeFactory,
+    create_basket, create_order)
 from oscar.test.testcases import WebTestCase
-from oscar.test.factories import SourceTypeFactory
-
 
 Basket = get_model('basket', 'Basket')
 Partner = get_model('partner', 'Partner')

tests/functional/dashboard/test_partner.py

@@ -1,7 +1,7 @@
 from django.urls import reverse
 
-from oscar.test.testcases import WebTestCase
 from oscar.apps.partner import models
+from oscar.test.testcases import WebTestCase
 
 
 class TestPartnerDashboard(WebTestCase):

tests/functional/dashboard/test_product.py

@@ -2,23 +2,22 @@ import datetime
 import os
 import posixpath
 import shutil
-from PIL import Image
 
 from django.conf import settings
 from django.urls import reverse
 from django.utils import timezone
+from PIL import Image
+from six import BytesIO
+from webtest import Upload
 
-from oscar.test import factories
-from oscar.test.testcases import WebTestCase
+from oscar.apps.catalogue.models import Product, ProductAttribute
 from oscar.core.compat import get_user_model
 from oscar.core.loading import get_model
-from oscar.apps.catalogue.models import Product, ProductAttribute
+from oscar.test import factories
 from oscar.test.factories import (
-    CategoryFactory, ProductFactory, ProductAttributeFactory,
-    ProductClassFactory)
-
-from six import BytesIO
-from webtest import Upload
+    CategoryFactory, ProductAttributeFactory, ProductClassFactory,
+    ProductFactory)
+from oscar.test.testcases import WebTestCase
 
 User = get_user_model()
 ProductImage = get_model('catalogue', 'ProductImage')

tests/functional/dashboard/test_range.py

@@ -1,14 +1,13 @@
 from django.contrib.messages.constants import SUCCESS, WARNING
-from django.urls import reverse
 from django.test import TestCase
+from django.urls import reverse
+from webtest.forms import Upload
 
 from oscar.apps.dashboard.ranges import forms
 from oscar.apps.offer.models import Range, RangeProductFileUpload
 from oscar.test.factories import create_product
 from oscar.test.testcases import WebTestCase
 
-from webtest.forms import Upload
-
 
 class RangeProductFormTests(TestCase):
 

tests/functional/dashboard/test_review.py

@@ -8,7 +8,6 @@ from oscar.core.loading import get_model
 from oscar.test.factories import ProductReviewFactory, UserFactory
 from oscar.test.testcases import WebTestCase
 
-
 ProductReview = get_model('reviews', 'productreview')
 User = get_user_model()
 

tests/functional/dashboard/test_shipping.py

@@ -2,8 +2,8 @@ from decimal import Decimal as D
 
 from django.urls import reverse
 
-from oscar.test.testcases import WebTestCase
 from oscar.apps.shipping import models
+from oscar.test.testcases import WebTestCase
 
 
 class TestShippingMethodDashboard(WebTestCase):

tests/functional/dashboard/test_widgets.py

@@ -1,9 +1,8 @@
 from django import forms
 from django.test import TestCase, override_settings
 
-from oscar.test.factories import Member
-
 from oscar.apps.dashboard.widgets import RelatedFieldWidgetWrapper
+from oscar.test.factories import Member
 
 
 @override_settings(ROOT_URLCONF='oscar.test.factories.urls')

tests/functional/dashboard/testcases.py

@@ -1,11 +1,12 @@
 import json
-from django.conf import settings
 from http import client as http_client
+
+from django.conf import settings
+from django.contrib.messages import INFO
 from django.urls import reverse
 from django.utils.http import urlencode
-from django.contrib.messages import INFO
-from oscar.core.loading import get_class
 
+from oscar.core.loading import get_class
 
 RelatedFieldWidgetWrapper = get_class('dashboard.widgets',
                                       'RelatedFieldWidgetWrapper')

tests/functional/test_basket.py

@@ -1,5 +1,5 @@
-from decimal import Decimal as D
 import datetime
+from decimal import Decimal as D
 from http import client as http_client
 from http.cookies import _unquote
 
@@ -17,7 +17,6 @@ from oscar.test.basket import add_product
 from oscar.test.factories import create_product
 from oscar.test.testcases import WebTestCase
 
-
 User = get_user_model()
 
 

tests/functional/test_stock_alert.py

@@ -3,9 +3,8 @@ from decimal import Decimal as D
 from django.test import TestCase
 
 from oscar.apps.partner.models import StockAlert
-from oscar.test.basket import add_product
 from oscar.test import factories
-
+from oscar.test.basket import add_product
 from tests._site.apps.partner.models import StockRecord
 
 

tests/integration/address/test_forms.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from oscar.apps.address import models, forms
+from oscar.apps.address import forms, models
 from oscar.test.factories import UserFactory
 
 

tests/integration/address/test_models.py

@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
 import pytest
-from django.test import TestCase
 from django.core import exceptions
+from django.test import TestCase
 
+from oscar.apps.address import models
 from oscar.apps.order.models import ShippingAddress
 from oscar.core.compat import get_user_model
-from oscar.apps.address import models
 from oscar.test import factories
-
 from tests._site.model_tests_app.models import (
-    UserAddressModelWithCustomBaseFields, UserAddressModelWithCustomHashFields
-)
+    UserAddressModelWithCustomBaseFields, UserAddressModelWithCustomHashFields)
 
 User = get_user_model()
 

tests/integration/basket/test_forms.py

@@ -1,8 +1,8 @@
 from decimal import Decimal as D
 from unittest import mock
 
-from django.test import TestCase, override_settings
 from django.conf import settings
+from django.test import TestCase, override_settings
 
 from oscar.apps.basket import forms, formsets
 from oscar.apps.offer.utils import Applicator
@@ -12,7 +12,6 @@ from oscar.test.basket import add_product
 from oscar.test.factories import (
     BenefitFactory, ConditionalOfferFactory, ConditionFactory, RangeFactory)
 
-
 Line = get_model('basket', 'Line')
 
 

tests/integration/basket/test_middleware.py

@@ -1,7 +1,7 @@
+from django.contrib.auth.models import AnonymousUser
 from django.http import HttpResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
-from django.contrib.auth.models import AnonymousUser
 
 from oscar.apps.basket import middleware
 

tests/integration/catalogue/reviews/test_models.py

@@ -1,10 +1,9 @@
-from django.test import TestCase
 from django.core.exceptions import ValidationError
+from django.test import TestCase
 
-from oscar.core.compat import get_user_model
 from oscar.apps.catalogue.reviews import models
-from oscar.test.factories import create_product
-from oscar.test.factories import UserFactory
+from oscar.core.compat import get_user_model
+from oscar.test.factories import UserFactory, create_product
 
 User = get_user_model()
 

tests/integration/catalogue/test_attributes.py

@@ -1,8 +1,8 @@
-from datetime import datetime, date
+from datetime import date, datetime
 
-from django.test import TestCase
 from django.core.exceptions import ValidationError
 from django.core.files.uploadedfile import SimpleUploadedFile
+from django.test import TestCase
 
 from oscar.test import factories
 

tests/integration/catalogue/test_category.py

@@ -3,8 +3,8 @@ from django.core.cache import cache
 from django.test import TestCase
 from django.test.utils import override_settings
 
-from oscar.apps.catalogue.models import Category
 from oscar.apps.catalogue.categories import create_from_breadcrumbs
+from oscar.apps.catalogue.models import Category
 from oscar.templatetags.category_tags import get_annotated_list
 
 

tests/integration/catalogue/test_options.py

@@ -1,8 +1,7 @@
 from django.test import TestCase
 
-from oscar.test import factories
 from oscar.core.loading import get_model
-
+from oscar.test import factories
 
 Product = get_model('catalogue', 'Product')
 

tests/integration/catalogue/test_product.py

@@ -1,12 +1,11 @@
 # coding=utf-8
+from django.core.exceptions import ValidationError
 from django.db import IntegrityError
 from django.test import TestCase
-from django.core.exceptions import ValidationError
 
-from oscar.apps.catalogue.models import (Product, ProductClass,
-                                         ProductAttribute,
-                                         AttributeOption,
-                                         ProductRecommendation)
+from oscar.apps.catalogue.models import (
+    AttributeOption, Product, ProductAttribute,
+    ProductClass, ProductRecommendation)
 from oscar.test import factories
 
 

tests/integration/catalogue/test_product_search_handler_setting.py

@@ -2,8 +2,7 @@ from django.test import TestCase
 from django.test.utils import override_settings
 
 from oscar.apps.catalogue.search_handlers import (
-    get_product_search_handler_class,
-)
+    get_product_search_handler_class)
 
 
 class TestSearchHandler(object):

tests/integration/checkout/test_mixins.py

@@ -6,14 +6,14 @@ from django.test import TestCase
 from django.test.utils import override_settings
 
 from oscar.apps.checkout.calculators import OrderTotalCalculator
-from oscar.apps.checkout.mixins import CheckoutSessionMixin, OrderPlacementMixin
 from oscar.apps.checkout.exceptions import FailedPreCondition
+from oscar.apps.checkout.mixins import (
+    CheckoutSessionMixin, OrderPlacementMixin)
+from oscar.apps.shipping.methods import FixedPrice, Free
 from oscar.core.loading import get_model
 from oscar.test import factories
 from oscar.test.basket import add_product
 from oscar.test.utils import RequestFactory
-from oscar.apps.shipping.methods import FixedPrice, Free
-
 
 Order = get_model('order', 'Order')
 

tests/integration/checkout/test_session.py

@@ -1,8 +1,8 @@
 from unittest import mock
 
+from django.contrib.sessions.middleware import SessionMiddleware
 from django.test import TestCase
 from django.test.client import RequestFactory
-from django.contrib.sessions.middleware import SessionMiddleware
 
 from oscar.apps.checkout.utils import CheckoutSessionData
 

tests/integration/core/test_compat.py

@@ -4,9 +4,9 @@ import datetime
 import io
 import os
 from tempfile import NamedTemporaryFile
-from django.utils.encoding import smart_text
 
 from django.test import TestCase, override_settings
+from django.utils.encoding import smart_text
 
 from oscar.core.compat import UnicodeCSVWriter, existing_user_fields
 

tests/integration/core/test_customisation.py

@@ -1,10 +1,9 @@
 import os
-from os.path import exists, join
 import sys
 import tempfile
+from os.path import exists, join
 
 import pytest
-
 from django.conf import settings
 from django.test import TestCase, override_settings
 

tests/integration/core/test_loading.py

@@ -1,13 +1,13 @@
-from os.path import dirname
 import sys
+from os.path import dirname
 
 from django.apps import AppConfig, apps
-from django.test import override_settings, TestCase
 from django.conf import settings
+from django.test import TestCase, override_settings
 
 from oscar.core.loading import (
-    get_model, AppNotFoundError, get_classes, get_class, get_class_loader,
-    ClassNotFoundError)
+    AppNotFoundError, ClassNotFoundError, get_class, get_class_loader,
+    get_classes, get_model)
 from tests import temporary_python_path
 from tests._site.loader import DummyClass
 

tests/integration/core/test_prices.py

@@ -1,5 +1,6 @@
 from decimal import Decimal as D
 from itertools import product
+
 from django.test import TestCase
 
 from oscar.core.prices import Price

tests/integration/core/test_validator.py

@@ -1,9 +1,10 @@
-from django.core.exceptions import ValidationError
 from django.contrib.flatpages.models import FlatPage
+from django.core.exceptions import ValidationError
 from django.test import TestCase, override_settings
 from django.utils.translation import activate
 
-from oscar.core.validators import ExtendedURLValidator, URLDoesNotExistValidator
+from oscar.core.validators import (
+    ExtendedURLValidator, URLDoesNotExistValidator)
 
 
 class TestExtendedURLValidator(TestCase):

tests/integration/customer/test_alert.py

@@ -2,9 +2,7 @@ from django.test import TestCase
 
 from oscar.apps.customer.models import ProductAlert
 from oscar.core.compat import get_user_model
-from oscar.test.factories import create_product
-from oscar.test.factories import UserFactory
-
+from oscar.test.factories import UserFactory, create_product
 
 User = get_user_model()
 

tests/integration/customer/test_customer.py

@@ -1,8 +1,7 @@
 from django.test import TestCase
 
-from oscar.core.compat import get_user_model
 from oscar.apps.customer.models import CommunicationEventType
-
+from oscar.core.compat import get_user_model
 
 User = get_user_model()
 

tests/integration/customer/test_dispatcher.py

@@ -1,12 +1,11 @@
 from django.core import mail
 from django.test import TestCase
 
-from oscar.core.compat import get_user_model
-from oscar.apps.customer.utils import Dispatcher, get_password_reset_url
 from oscar.apps.customer.models import CommunicationEventType, Email
+from oscar.apps.customer.utils import Dispatcher, get_password_reset_url
 from oscar.apps.order.models import CommunicationEvent
-from oscar.test.factories import create_order, SiteFactory
-
+from oscar.core.compat import get_user_model
+from oscar.test.factories import SiteFactory, create_order
 
 User = get_user_model()
 

tests/integration/customer/test_history.py

@@ -1,5 +1,5 @@
-from django.test import TestCase
 from django import http
+from django.test import TestCase
 
 from oscar.apps.customer import history
 

tests/integration/customer/test_utils.py

@@ -1,8 +1,7 @@
 from django.test import TestCase
 
-from oscar.core.compat import get_user_model
 from oscar.apps.customer.utils import get_password_reset_url, normalise_email
-
+from oscar.core.compat import get_user_model
 
 User = get_user_model()
 

tests/integration/dashboard/test_offer_forms.py

@@ -2,11 +2,11 @@ from decimal import Decimal as D
 
 from django.core.exceptions import ValidationError
 from django.test import TestCase
+
 from oscar.apps.dashboard.offers import forms
 from oscar.apps.offer.custom import create_benefit
-from oscar.apps.offer.models import Range, Benefit
+from oscar.apps.offer.models import Benefit, Range
 from oscar.test.factories import create_product
-
 from tests._site.model_tests_app.models import CustomBenefitModel
 
 

tests/integration/dashboard/test_reviews.py

@@ -8,7 +8,6 @@ from oscar.core.loading import get_model
 from oscar.test.factories.catalogue import ProductReviewFactory
 from oscar.test.factories.customer import UserFactory
 
-
 now = timezone.now()
 
 

tests/integration/dashboard/test_voucher_form.py

@@ -1,7 +1,8 @@
-from django import test
 from datetime import timedelta
-from django.utils import timezone
+
 import pytest
+from django import test
+from django.utils import timezone
 
 from oscar.apps.dashboard.vouchers import forms
 from oscar.test.factories.offer import RangeFactory

tests/integration/forms/test_field.py

@@ -1,6 +1,7 @@
-from oscar.forms import fields
 from django.test import TestCase
 
+from oscar.forms import fields
+
 
 class TestExtendedURLField(TestCase):
     """ExtendedURLField"""

tests/integration/offer/test_absolute_benefit.py

@@ -6,8 +6,8 @@ from django.test import TestCase
 
 from oscar.apps.offer import models
 from oscar.apps.offer.utils import Applicator
-from oscar.test.basket import add_product, add_products
 from oscar.test import factories
+from oscar.test.basket import add_product, add_products
 
 
 class TestAnAbsoluteDiscountAppliedWithCountConditionOnDifferentRange(TestCase):

tests/integration/offer/test_applicator.py

@@ -6,11 +6,10 @@ from django.test import TestCase
 from oscar.apps.offer import models
 from oscar.apps.offer.results import OfferApplications
 from oscar.apps.offer.utils import Applicator
-from oscar.test.factories import (
-    BasketFactory, RangeFactory, BenefitFactory, ConditionFactory,
-    ConditionalOfferFactory)
-
 from oscar.test.basket import add_product
+from oscar.test.factories import (
+    BasketFactory, BenefitFactory, ConditionalOfferFactory, ConditionFactory,
+    RangeFactory)
 
 
 class TestOfferApplicator(TestCase):

tests/integration/offer/test_benefit.py

@@ -1,4 +1,4 @@
-from decimal import Decimal, ROUND_DOWN
+from decimal import ROUND_DOWN, Decimal
 from unittest.mock import patch
 
 import pytest

tests/integration/offer/test_combination.py

@@ -3,8 +3,8 @@ from decimal import Decimal as D
 from django.test import TestCase
 
 from oscar.apps.offer import models
-from oscar.test.basket import add_product, add_products
 from oscar.test import factories
+from oscar.test.basket import add_product, add_products
 
 
 class TestACountConditionWithPercentageDiscount(TestCase):

tests/integration/offer/test_condition.py

@@ -1,14 +1,13 @@
-import pytest
 from decimal import Decimal as D
 from unittest import mock
 
+import pytest
 from django.test import TestCase
 
 from oscar.apps.basket.models import Basket
 from oscar.apps.offer import custom, models
 from oscar.test import factories
 from oscar.test.basket import add_product
-
 from tests._site.model_tests_app.models import BasketOwnerCalledBarry
 
 

tests/integration/offer/test_conditionaloffer_delete.py

@@ -2,9 +2,8 @@ from django.test import TestCase
 
 from oscar.apps.offer import custom, models
 from oscar.test import factories
-
-from tests._site.model_tests_app.models import (BasketOwnerCalledBarry,
-                                                CustomBenefitModel)
+from tests._site.model_tests_app.models import (
+    BasketOwnerCalledBarry, CustomBenefitModel)
 
 
 class TestConditionalOfferDelete(TestCase):

tests/integration/offer/test_custom.py

@@ -2,7 +2,8 @@ from django.test import TestCase
 
 from oscar.apps.offer import custom
 from tests._site.model_tests_app.models import (
-    CustomBenefitModel, CustomBenefitWithoutName, CustomConditionModel, CustomConditionWithoutName)
+    CustomBenefitModel, CustomBenefitWithoutName, CustomConditionModel,
+    CustomConditionWithoutName)
 
 
 class TestCustomBenefit(TestCase):

tests/integration/offer/test_custom_range.py

@@ -1,9 +1,9 @@
 from django.core.exceptions import ValidationError
 from django.test import TestCase
-from oscar.test.factories import create_product
 from django.utils.translation import gettext_lazy as _
 
 from oscar.apps.offer import custom
+from oscar.test.factories import create_product
 
 
 class CustomRange(object):

tests/integration/offer/test_manager.py

@@ -3,8 +3,8 @@ import datetime
 from django.test import TestCase
 from django.utils import timezone
 
-from oscar.test import factories
 from oscar.apps.offer import models
+from oscar.test import factories
 
 
 class TestActiveOfferManager(TestCase):

tests/integration/offer/test_multibuy_benefit.py

@@ -5,8 +5,8 @@ from django.core.exceptions import ValidationError
 from django.test import TestCase
 
 from oscar.apps.offer import models
-from oscar.test.basket import add_product, add_products
 from oscar.test import factories
+from oscar.test.basket import add_product, add_products
 
 
 class TestAMultibuyDiscountAppliedWithCountCondition(TestCase):