Implement black and Pylint (#4126)

.github/workflows/test.yml

@@ -66,11 +66,10 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
+        pip install -e .[test]
         pip install -r requirements.txt
     - name: Run linters
-      run: |
-        flake8 src tests setup.py
-        isort -c -q --diff src/ tests/
+      run: make lint
   lint_js:
     runs-on: ubuntu-latest
     steps:

Makefile

@@ -80,10 +80,16 @@ retest: venv ## Run failed tests only
 coverage: venv ## Generate coverage report
 	$(PYTEST) --cov=oscar --cov-report=term-missing
 
-lint: ## Run flake8 and isort checks
-	flake8 src/oscar/
-	flake8 tests/
-	isort -c -q --diff src/ tests/
+lint:
+	@black --check --exclude "migrations/*" src/oscar/
+	@black --check --exclude "migrations/*" tests/
+	@pylint setup.py src/oscar/
+	@pylint setup.py tests/
+
+
+black:
+	@black --exclude "migrations/*" src/oscar/
+	@black --exclude "migrations/*" tests/
 
 test_migrations: install-migrations-testing-requirements ## Tests migrations
 	cd sandbox && ./test_migrations.sh

pylintrc

@@ -0,0 +1,12 @@
+[MASTER]
+jobs = 1
+load-plugins = pylint_django
+score = n
+ignore = migrations
+django-settings-module = sandbox.settings
+
+[MESSAGES CONTROL]
+disable = R,C,W5103,W0707,W0719,W0718,W0212,E5110
+
+[TYPECHECK]
+ignored-classes = responses

requirements.txt

@@ -16,9 +16,9 @@ uWSGI>=2.0.19
 whitenoise>=5.2,<6.5
 
 # Linting
-flake8<7.0.0
-flake8-debugger==4.1.2
-isort==5.10.1
+pylint>=2.17.4
+pylint-django>=2.5.3
+black>=23.3.0
 
 # Helpers
 pyprof2calltree>=1.4,<1.5

setup.py

@@ -69,7 +69,7 @@ test_requires = [
     easy_thumbnails_version,
 ]
 
-with open(os.path.join(PROJECT_DIR, 'README.rst')) as fh:
+with open(os.path.join(PROJECT_DIR, 'README.rst'), encoding="utf-8") as fh:
     long_description = re.sub(
         '^.. start-no-pypi.*^.. end-no-pypi', '', fh.read(), flags=re.M | re.S)
 

src/oscar/__init__.py

@@ -1,71 +1,69 @@
 # Use 'alpha', 'beta', 'rc' or 'final' as the 4th element to indicate release type.
-VERSION = (3, 2, 0, 'final')
+VERSION = (3, 2, 0, "final")
 
 
 def get_short_version():
-    return '%s.%s' % (VERSION[0], VERSION[1])
+    return "%s.%s" % (VERSION[0], VERSION[1])
 
 
 def get_version():
-    version = '%s.%s' % (VERSION[0], VERSION[1])
+    version = "%s.%s" % (VERSION[0], VERSION[1])
     # Append 3rd digit if > 0
     if VERSION[2]:
-        version = '%s.%s' % (version, VERSION[2])
-    elif VERSION[3] != 'final':
-        mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'c'}
-        version = '%s%s' % (version, mapping[VERSION[3]])
+        version = "%s.%s" % (version, VERSION[2])
+    elif VERSION[3] != "final":
+        mapping = {"alpha": "a", "beta": "b", "rc": "c"}
+        version = "%s%s" % (version, mapping[VERSION[3]])
         if len(VERSION) == 5:
-            version = '%s%s' % (version, VERSION[4])
+            version = "%s%s" % (version, VERSION[4])
     return version
 
 
 INSTALLED_APPS = [
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'django.contrib.sites',
-    'django.contrib.flatpages',
-
-    'oscar.config.Shop',
-    'oscar.apps.analytics.apps.AnalyticsConfig',
-    'oscar.apps.checkout.apps.CheckoutConfig',
-    'oscar.apps.address.apps.AddressConfig',
-    'oscar.apps.shipping.apps.ShippingConfig',
-    'oscar.apps.catalogue.apps.CatalogueConfig',
-    'oscar.apps.catalogue.reviews.apps.CatalogueReviewsConfig',
-    'oscar.apps.communication.apps.CommunicationConfig',
-    'oscar.apps.partner.apps.PartnerConfig',
-    'oscar.apps.basket.apps.BasketConfig',
-    'oscar.apps.payment.apps.PaymentConfig',
-    'oscar.apps.offer.apps.OfferConfig',
-    'oscar.apps.order.apps.OrderConfig',
-    'oscar.apps.customer.apps.CustomerConfig',
-    'oscar.apps.search.apps.SearchConfig',
-    'oscar.apps.voucher.apps.VoucherConfig',
-    'oscar.apps.wishlists.apps.WishlistsConfig',
-    'oscar.apps.dashboard.apps.DashboardConfig',
-    'oscar.apps.dashboard.reports.apps.ReportsDashboardConfig',
-    'oscar.apps.dashboard.users.apps.UsersDashboardConfig',
-    'oscar.apps.dashboard.orders.apps.OrdersDashboardConfig',
-    'oscar.apps.dashboard.catalogue.apps.CatalogueDashboardConfig',
-    'oscar.apps.dashboard.offers.apps.OffersDashboardConfig',
-    'oscar.apps.dashboard.partners.apps.PartnersDashboardConfig',
-    'oscar.apps.dashboard.pages.apps.PagesDashboardConfig',
-    'oscar.apps.dashboard.ranges.apps.RangesDashboardConfig',
-    'oscar.apps.dashboard.reviews.apps.ReviewsDashboardConfig',
-    'oscar.apps.dashboard.vouchers.apps.VouchersDashboardConfig',
-    'oscar.apps.dashboard.communications.apps.CommunicationsDashboardConfig',
-    'oscar.apps.dashboard.shipping.apps.ShippingDashboardConfig',
-
+    "django.contrib.admin",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "django.contrib.staticfiles",
+    "django.contrib.sites",
+    "django.contrib.flatpages",
+    "oscar.config.Shop",
+    "oscar.apps.analytics.apps.AnalyticsConfig",
+    "oscar.apps.checkout.apps.CheckoutConfig",
+    "oscar.apps.address.apps.AddressConfig",
+    "oscar.apps.shipping.apps.ShippingConfig",
+    "oscar.apps.catalogue.apps.CatalogueConfig",
+    "oscar.apps.catalogue.reviews.apps.CatalogueReviewsConfig",
+    "oscar.apps.communication.apps.CommunicationConfig",
+    "oscar.apps.partner.apps.PartnerConfig",
+    "oscar.apps.basket.apps.BasketConfig",
+    "oscar.apps.payment.apps.PaymentConfig",
+    "oscar.apps.offer.apps.OfferConfig",
+    "oscar.apps.order.apps.OrderConfig",
+    "oscar.apps.customer.apps.CustomerConfig",
+    "oscar.apps.search.apps.SearchConfig",
+    "oscar.apps.voucher.apps.VoucherConfig",
+    "oscar.apps.wishlists.apps.WishlistsConfig",
+    "oscar.apps.dashboard.apps.DashboardConfig",
+    "oscar.apps.dashboard.reports.apps.ReportsDashboardConfig",
+    "oscar.apps.dashboard.users.apps.UsersDashboardConfig",
+    "oscar.apps.dashboard.orders.apps.OrdersDashboardConfig",
+    "oscar.apps.dashboard.catalogue.apps.CatalogueDashboardConfig",
+    "oscar.apps.dashboard.offers.apps.OffersDashboardConfig",
+    "oscar.apps.dashboard.partners.apps.PartnersDashboardConfig",
+    "oscar.apps.dashboard.pages.apps.PagesDashboardConfig",
+    "oscar.apps.dashboard.ranges.apps.RangesDashboardConfig",
+    "oscar.apps.dashboard.reviews.apps.ReviewsDashboardConfig",
+    "oscar.apps.dashboard.vouchers.apps.VouchersDashboardConfig",
+    "oscar.apps.dashboard.communications.apps.CommunicationsDashboardConfig",
+    "oscar.apps.dashboard.shipping.apps.ShippingDashboardConfig",
     # 3rd-party apps that oscar depends on
-    'widget_tweaks',
-    'haystack',
-    'treebeard',
-    'django_tables2',
+    "widget_tweaks",
+    "haystack",
+    "treebeard",
+    "django_tables2",
 ]
 
 
-default_app_config = 'oscar.config.Shop'
+default_app_config = "oscar.config.Shop"

src/oscar/apps/address/__init__.py

@@ -1 +1 @@
-default_app_config = 'oscar.apps.address.apps.AddressConfig'
+default_app_config = "oscar.apps.address.apps.AddressConfig"

src/oscar/apps/address/abstract_models.py

@@ -19,7 +19,8 @@ class AbstractAddress(models.Model):
     This is subclassed and extended to provide models for
     user, shipping and billing addresses.
     """
-    MR, MISS, MRS, MS, DR = ('Mr', 'Miss', 'Mrs', 'Ms', 'Dr')
+
+    MR, MISS, MRS, MS, DR = ("Mr", "Miss", "Mrs", "Ms", "Dr")
     TITLE_CHOICES = (
         (MR, _("Mr")),
         (MISS, _("Miss")),
@@ -28,229 +29,248 @@ class AbstractAddress(models.Model):
         (DR, _("Dr")),
     )
 
-    POSTCODE_REQUIRED = 'postcode' in settings.OSCAR_REQUIRED_ADDRESS_FIELDS
+    POSTCODE_REQUIRED = "postcode" in settings.OSCAR_REQUIRED_ADDRESS_FIELDS
 
     # Regex for each country. Not listed countries don't use postcodes
     # Based on http://en.wikipedia.org/wiki/List_of_postal_codes
     POSTCODES_REGEX = {
-        'AC': r'^[A-Z]{4}[0-9][A-Z]$',
-        'AD': r'^AD[0-9]{3}$',
-        'AF': r'^[0-9]{4}$',
-        'AI': r'^AI-2640$',
-        'AL': r'^[0-9]{4}$',
-        'AM': r'^[0-9]{4}$',
-        'AR': r'^([0-9]{4}|[A-Z][0-9]{4}[A-Z]{3})$',
-        'AS': r'^[0-9]{5}(-[0-9]{4}|-[0-9]{6})?$',
-        'AT': r'^[0-9]{4}$',
-        'AU': r'^[0-9]{4}$',
-        'AX': r'^[0-9]{5}$',
-        'AZ': r'^AZ[0-9]{4}$',
-        'BA': r'^[0-9]{5}$',
-        'BB': r'^BB[0-9]{5}$',
-        'BD': r'^[0-9]{4}$',
-        'BE': r'^[0-9]{4}$',
-        'BG': r'^[0-9]{4}$',
-        'BH': r'^[0-9]{3,4}$',
-        'BL': r'^[0-9]{5}$',
-        'BM': r'^[A-Z]{2}([0-9]{2}|[A-Z]{2})',
-        'BN': r'^[A-Z]{2}[0-9]{4}$',
-        'BO': r'^[0-9]{4}$',
-        'BR': r'^[0-9]{5}(-[0-9]{3})?$',
-        'BT': r'^[0-9]{3}$',
-        'BY': r'^[0-9]{6}$',
-        'CA': r'^[A-Z][0-9][A-Z][0-9][A-Z][0-9]$',
-        'CC': r'^[0-9]{4}$',
-        'CH': r'^[0-9]{4}$',
-        'CL': r'^([0-9]{7}|[0-9]{3}-[0-9]{4})$',
-        'CN': r'^[0-9]{6}$',
-        'CO': r'^[0-9]{6}$',
-        'CR': r'^[0-9]{4,5}$',
-        'CU': r'^[0-9]{5}$',
-        'CV': r'^[0-9]{4}$',
-        'CX': r'^[0-9]{4}$',
-        'CY': r'^[0-9]{4}$',
-        'CZ': r'^[0-9]{5}$',
-        'DE': r'^[0-9]{5}$',
-        'DK': r'^[0-9]{4}$',
-        'DO': r'^[0-9]{5}$',
-        'DZ': r'^[0-9]{5}$',
-        'EC': r'^EC[0-9]{6}$',
-        'EE': r'^[0-9]{5}$',
-        'EG': r'^[0-9]{5}$',
-        'ES': r'^[0-9]{5}$',
-        'ET': r'^[0-9]{4}$',
-        'FI': r'^[0-9]{5}$',
-        'FK': r'^[A-Z]{4}[0-9][A-Z]{2}$',
-        'FM': r'^[0-9]{5}(-[0-9]{4})?$',
-        'FO': r'^[0-9]{3}$',
-        'FR': r'^[0-9]{5}$',
-        'GA': r'^[0-9]{2}.*[0-9]{2}$',
-        'GB': r'^[A-Z][A-Z0-9]{1,3}[0-9][A-Z]{2}$',
-        'GE': r'^[0-9]{4}$',
-        'GF': r'^[0-9]{5}$',
-        'GG': r'^([A-Z]{2}[0-9]{2,3}[A-Z]{2})$',
-        'GI': r'^GX111AA$',
-        'GL': r'^[0-9]{4}$',
-        'GP': r'^[0-9]{5}$',
-        'GR': r'^[0-9]{5}$',
-        'GS': r'^SIQQ1ZZ$',
-        'GT': r'^[0-9]{5}$',
-        'GU': r'^[0-9]{5}$',
-        'GW': r'^[0-9]{4}$',
-        'HM': r'^[0-9]{4}$',
-        'HN': r'^[0-9]{5}$',
-        'HR': r'^[0-9]{5}$',
-        'HT': r'^[0-9]{4}$',
-        'HU': r'^[0-9]{4}$',
-        'ID': r'^[0-9]{5}$',
-        'IL': r'^([0-9]{5}|[0-9]{7})$',
-        'IM': r'^IM[0-9]{2,3}[A-Z]{2}$$',
-        'IN': r'^[0-9]{6}$',
-        'IO': r'^[A-Z]{4}[0-9][A-Z]{2}$',
-        'IQ': r'^[0-9]{5}$',
-        'IR': r'^[0-9]{5}-[0-9]{5}$',
-        'IS': r'^[0-9]{3}$',
-        'IT': r'^[0-9]{5}$',
-        'JE': r'^JE[0-9]{2}[A-Z]{2}$',
-        'JM': r'^JM[A-Z]{3}[0-9]{2}$',
-        'JO': r'^[0-9]{5}$',
-        'JP': r'^[0-9]{3}-?[0-9]{4}$',
-        'KE': r'^[0-9]{5}$',
-        'KG': r'^[0-9]{6}$',
-        'KH': r'^[0-9]{5}$',
-        'KR': r'^[0-9]{5}$',
-        'KY': r'^KY[0-9]-[0-9]{4}$',
-        'KZ': r'^[0-9]{6}$',
-        'LA': r'^[0-9]{5}$',
-        'LB': r'^[0-9]{8}$',
-        'LI': r'^[0-9]{4}$',
-        'LK': r'^[0-9]{5}$',
-        'LR': r'^[0-9]{4}$',
-        'LS': r'^[0-9]{3}$',
-        'LT': r'^(LT-)?[0-9]{5}$',
-        'LU': r'^[0-9]{4}$',
-        'LV': r'^LV-[0-9]{4}$',
-        'LY': r'^[0-9]{5}$',
-        'MA': r'^[0-9]{5}$',
-        'MC': r'^980[0-9]{2}$',
-        'MD': r'^MD-?[0-9]{4}$',
-        'ME': r'^[0-9]{5}$',
-        'MF': r'^[0-9]{5}$',
-        'MG': r'^[0-9]{3}$',
-        'MH': r'^[0-9]{5}$',
-        'MK': r'^[0-9]{4}$',
-        'MM': r'^[0-9]{5}$',
-        'MN': r'^[0-9]{5}$',
-        'MP': r'^[0-9]{5}$',
-        'MQ': r'^[0-9]{5}$',
-        'MT': r'^[A-Z]{3}[0-9]{4}$',
-        'MV': r'^[0-9]{4,5}$',
-        'MX': r'^[0-9]{5}$',
-        'MY': r'^[0-9]{5}$',
-        'MZ': r'^[0-9]{4}$',
-        'NA': r'^[0-9]{5}$',
-        'NC': r'^[0-9]{5}$',
-        'NE': r'^[0-9]{4}$',
-        'NF': r'^[0-9]{4}$',
-        'NG': r'^[0-9]{6}$',
-        'NI': r'^[0-9]{5}$',
-        'NL': r'^[0-9]{4}[A-Z]{2}$',
-        'NO': r'^[0-9]{4}$',
-        'NP': r'^[0-9]{5}$',
-        'NZ': r'^[0-9]{4}$',
-        'OM': r'^[0-9]{3}$',
-        'PA': r'^[0-9]{6}$',
-        'PE': r'^[0-9]{5}$',
-        'PF': r'^[0-9]{5}$',
-        'PG': r'^[0-9]{3}$',
-        'PH': r'^[0-9]{4}$',
-        'PK': r'^[0-9]{5}$',
-        'PL': r'^[0-9]{2}-?[0-9]{3}$',
-        'PM': r'^[0-9]{5}$',
-        'PN': r'^[A-Z]{4}[0-9][A-Z]{2}$',
-        'PR': r'^[0-9]{5}$',
-        'PT': r'^[0-9]{4}(-?[0-9]{3})?$',
-        'PW': r'^[0-9]{5}$',
-        'PY': r'^[0-9]{4}$',
-        'RE': r'^[0-9]{5}$',
-        'RO': r'^[0-9]{6}$',
-        'RS': r'^[0-9]{5}$',
-        'RU': r'^[0-9]{6}$',
-        'SA': r'^[0-9]{5}$',
-        'SD': r'^[0-9]{5}$',
-        'SE': r'^[0-9]{5}$',
-        'SG': r'^([0-9]{2}|[0-9]{4}|[0-9]{6})$',
-        'SH': r'^(STHL1ZZ|TDCU1ZZ)$',
-        'SI': r'^(SI-)?[0-9]{4}$',
-        'SK': r'^[0-9]{5}$',
-        'SM': r'^[0-9]{5}$',
-        'SN': r'^[0-9]{5}$',
-        'SV': r'^01101$',
-        'SZ': r'^[A-Z][0-9]{3}$',
-        'TC': r'^TKCA1ZZ$',
-        'TD': r'^[0-9]{5}$',
-        'TH': r'^[0-9]{5}$',
-        'TJ': r'^[0-9]{6}$',
-        'TM': r'^[0-9]{6}$',
-        'TN': r'^[0-9]{4}$',
-        'TR': r'^[0-9]{5}$',
-        'TT': r'^[0-9]{6}$',
-        'TW': r'^([0-9]{3}|[0-9]{5})$',
-        'UA': r'^[0-9]{5}$',
-        'US': r'^[0-9]{5}(-[0-9]{4}|-[0-9]{6})?$',
-        'UY': r'^[0-9]{5}$',
-        'UZ': r'^[0-9]{6}$',
-        'VA': r'^00120$',
-        'VC': r'^VC[0-9]{4}',
-        'VE': r'^[0-9]{4}[A-Z]?$',
-        'VG': r'^VG[0-9]{4}$',
-        'VI': r'^[0-9]{5}$',
-        'VN': r'^[0-9]{6}$',
-        'WF': r'^[0-9]{5}$',
-        'XK': r'^[0-9]{5}$',
-        'YT': r'^[0-9]{5}$',
-        'ZA': r'^[0-9]{4}$',
-        'ZM': r'^[0-9]{5}$',
+        "AC": r"^[A-Z]{4}[0-9][A-Z]$",
+        "AD": r"^AD[0-9]{3}$",
+        "AF": r"^[0-9]{4}$",
+        "AI": r"^AI-2640$",
+        "AL": r"^[0-9]{4}$",
+        "AM": r"^[0-9]{4}$",
+        "AR": r"^([0-9]{4}|[A-Z][0-9]{4}[A-Z]{3})$",
+        "AS": r"^[0-9]{5}(-[0-9]{4}|-[0-9]{6})?$",
+        "AT": r"^[0-9]{4}$",
+        "AU": r"^[0-9]{4}$",
+        "AX": r"^[0-9]{5}$",
+        "AZ": r"^AZ[0-9]{4}$",
+        "BA": r"^[0-9]{5}$",
+        "BB": r"^BB[0-9]{5}$",
+        "BD": r"^[0-9]{4}$",
+        "BE": r"^[0-9]{4}$",
+        "BG": r"^[0-9]{4}$",
+        "BH": r"^[0-9]{3,4}$",
+        "BL": r"^[0-9]{5}$",
+        "BM": r"^[A-Z]{2}([0-9]{2}|[A-Z]{2})",
+        "BN": r"^[A-Z]{2}[0-9]{4}$",
+        "BO": r"^[0-9]{4}$",
+        "BR": r"^[0-9]{5}(-[0-9]{3})?$",
+        "BT": r"^[0-9]{3}$",
+        "BY": r"^[0-9]{6}$",
+        "CA": r"^[A-Z][0-9][A-Z][0-9][A-Z][0-9]$",
+        "CC": r"^[0-9]{4}$",
+        "CH": r"^[0-9]{4}$",
+        "CL": r"^([0-9]{7}|[0-9]{3}-[0-9]{4})$",
+        "CN": r"^[0-9]{6}$",
+        "CO": r"^[0-9]{6}$",
+        "CR": r"^[0-9]{4,5}$",
+        "CU": r"^[0-9]{5}$",
+        "CV": r"^[0-9]{4}$",
+        "CX": r"^[0-9]{4}$",
+        "CY": r"^[0-9]{4}$",
+        "CZ": r"^[0-9]{5}$",
+        "DE": r"^[0-9]{5}$",
+        "DK": r"^[0-9]{4}$",
+        "DO": r"^[0-9]{5}$",
+        "DZ": r"^[0-9]{5}$",
+        "EC": r"^EC[0-9]{6}$",
+        "EE": r"^[0-9]{5}$",
+        "EG": r"^[0-9]{5}$",
+        "ES": r"^[0-9]{5}$",
+        "ET": r"^[0-9]{4}$",
+        "FI": r"^[0-9]{5}$",
+        "FK": r"^[A-Z]{4}[0-9][A-Z]{2}$",
+        "FM": r"^[0-9]{5}(-[0-9]{4})?$",
+        "FO": r"^[0-9]{3}$",
+        "FR": r"^[0-9]{5}$",
+        "GA": r"^[0-9]{2}.*[0-9]{2}$",
+        "GB": r"^[A-Z][A-Z0-9]{1,3}[0-9][A-Z]{2}$",
+        "GE": r"^[0-9]{4}$",
+        "GF": r"^[0-9]{5}$",
+        "GG": r"^([A-Z]{2}[0-9]{2,3}[A-Z]{2})$",
+        "GI": r"^GX111AA$",
+        "GL": r"^[0-9]{4}$",
+        "GP": r"^[0-9]{5}$",
+        "GR": r"^[0-9]{5}$",
+        "GS": r"^SIQQ1ZZ$",
+        "GT": r"^[0-9]{5}$",
+        "GU": r"^[0-9]{5}$",
+        "GW": r"^[0-9]{4}$",
+        "HM": r"^[0-9]{4}$",
+        "HN": r"^[0-9]{5}$",
+        "HR": r"^[0-9]{5}$",
+        "HT": r"^[0-9]{4}$",
+        "HU": r"^[0-9]{4}$",
+        "ID": r"^[0-9]{5}$",
+        "IL": r"^([0-9]{5}|[0-9]{7})$",
+        "IM": r"^IM[0-9]{2,3}[A-Z]{2}$$",
+        "IN": r"^[0-9]{6}$",
+        "IO": r"^[A-Z]{4}[0-9][A-Z]{2}$",
+        "IQ": r"^[0-9]{5}$",
+        "IR": r"^[0-9]{5}-[0-9]{5}$",
+        "IS": r"^[0-9]{3}$",
+        "IT": r"^[0-9]{5}$",
+        "JE": r"^JE[0-9]{2}[A-Z]{2}$",
+        "JM": r"^JM[A-Z]{3}[0-9]{2}$",
+        "JO": r"^[0-9]{5}$",
+        "JP": r"^[0-9]{3}-?[0-9]{4}$",
+        "KE": r"^[0-9]{5}$",
+        "KG": r"^[0-9]{6}$",
+        "KH": r"^[0-9]{5}$",
+        "KR": r"^[0-9]{5}$",
+        "KY": r"^KY[0-9]-[0-9]{4}$",
+        "KZ": r"^[0-9]{6}$",
+        "LA": r"^[0-9]{5}$",
+        "LB": r"^[0-9]{8}$",
+        "LI": r"^[0-9]{4}$",
+        "LK": r"^[0-9]{5}$",
+        "LR": r"^[0-9]{4}$",
+        "LS": r"^[0-9]{3}$",
+        "LT": r"^(LT-)?[0-9]{5}$",
+        "LU": r"^[0-9]{4}$",
+        "LV": r"^LV-[0-9]{4}$",
+        "LY": r"^[0-9]{5}$",
+        "MA": r"^[0-9]{5}$",
+        "MC": r"^980[0-9]{2}$",
+        "MD": r"^MD-?[0-9]{4}$",
+        "ME": r"^[0-9]{5}$",
+        "MF": r"^[0-9]{5}$",
+        "MG": r"^[0-9]{3}$",
+        "MH": r"^[0-9]{5}$",
+        "MK": r"^[0-9]{4}$",
+        "MM": r"^[0-9]{5}$",
+        "MN": r"^[0-9]{5}$",
+        "MP": r"^[0-9]{5}$",
+        "MQ": r"^[0-9]{5}$",
+        "MT": r"^[A-Z]{3}[0-9]{4}$",
+        "MV": r"^[0-9]{4,5}$",
+        "MX": r"^[0-9]{5}$",
+        "MY": r"^[0-9]{5}$",
+        "MZ": r"^[0-9]{4}$",
+        "NA": r"^[0-9]{5}$",
+        "NC": r"^[0-9]{5}$",
+        "NE": r"^[0-9]{4}$",
+        "NF": r"^[0-9]{4}$",
+        "NG": r"^[0-9]{6}$",
+        "NI": r"^[0-9]{5}$",
+        "NL": r"^[0-9]{4}[A-Z]{2}$",
+        "NO": r"^[0-9]{4}$",
+        "NP": r"^[0-9]{5}$",
+        "NZ": r"^[0-9]{4}$",
+        "OM": r"^[0-9]{3}$",
+        "PA": r"^[0-9]{6}$",
+        "PE": r"^[0-9]{5}$",
+        "PF": r"^[0-9]{5}$",
+        "PG": r"^[0-9]{3}$",
+        "PH": r"^[0-9]{4}$",
+        "PK": r"^[0-9]{5}$",
+        "PL": r"^[0-9]{2}-?[0-9]{3}$",
+        "PM": r"^[0-9]{5}$",
+        "PN": r"^[A-Z]{4}[0-9][A-Z]{2}$",
+        "PR": r"^[0-9]{5}$",
+        "PT": r"^[0-9]{4}(-?[0-9]{3})?$",
+        "PW": r"^[0-9]{5}$",
+        "PY": r"^[0-9]{4}$",
+        "RE": r"^[0-9]{5}$",
+        "RO": r"^[0-9]{6}$",
+        "RS": r"^[0-9]{5}$",
+        "RU": r"^[0-9]{6}$",
+        "SA": r"^[0-9]{5}$",
+        "SD": r"^[0-9]{5}$",
+        "SE": r"^[0-9]{5}$",
+        "SG": r"^([0-9]{2}|[0-9]{4}|[0-9]{6})$",
+        "SH": r"^(STHL1ZZ|TDCU1ZZ)$",
+        "SI": r"^(SI-)?[0-9]{4}$",
+        "SK": r"^[0-9]{5}$",
+        "SM": r"^[0-9]{5}$",
+        "SN": r"^[0-9]{5}$",
+        "SV": r"^01101$",
+        "SZ": r"^[A-Z][0-9]{3}$",
+        "TC": r"^TKCA1ZZ$",
+        "TD": r"^[0-9]{5}$",
+        "TH": r"^[0-9]{5}$",
+        "TJ": r"^[0-9]{6}$",
+        "TM": r"^[0-9]{6}$",
+        "TN": r"^[0-9]{4}$",
+        "TR": r"^[0-9]{5}$",
+        "TT": r"^[0-9]{6}$",
+        "TW": r"^([0-9]{3}|[0-9]{5})$",
+        "UA": r"^[0-9]{5}$",
+        "US": r"^[0-9]{5}(-[0-9]{4}|-[0-9]{6})?$",
+        "UY": r"^[0-9]{5}$",
+        "UZ": r"^[0-9]{6}$",
+        "VA": r"^00120$",
+        "VC": r"^VC[0-9]{4}",
+        "VE": r"^[0-9]{4}[A-Z]?$",
+        "VG": r"^VG[0-9]{4}$",
+        "VI": r"^[0-9]{5}$",
+        "VN": r"^[0-9]{6}$",
+        "WF": r"^[0-9]{5}$",
+        "XK": r"^[0-9]{5}$",
+        "YT": r"^[0-9]{5}$",
+        "ZA": r"^[0-9]{4}$",
+        "ZM": r"^[0-9]{5}$",
     }
 
     title = models.CharField(
         pgettext_lazy("Treatment Pronouns for the customer", "Title"),
-        max_length=64, choices=TITLE_CHOICES, blank=True)
+        max_length=64,
+        choices=TITLE_CHOICES,
+        blank=True,
+    )
     first_name = models.CharField(_("First name"), max_length=255, blank=True)
     last_name = models.CharField(_("Last name"), max_length=255, blank=True)
 
     # We use quite a few lines of an address as they are often quite long and
     # it's easier to just hide the unnecessary ones than add extra ones.
     line1 = models.CharField(_("First line of address"), max_length=255)
-    line2 = models.CharField(
-        _("Second line of address"), max_length=255, blank=True)
-    line3 = models.CharField(
-        _("Third line of address"), max_length=255, blank=True)
+    line2 = models.CharField(_("Second line of address"), max_length=255, blank=True)
+    line3 = models.CharField(_("Third line of address"), max_length=255, blank=True)
     line4 = models.CharField(_("City"), max_length=255, blank=True)
     state = models.CharField(_("State/County"), max_length=255, blank=True)
-    postcode = UppercaseCharField(
-        _("Post/Zip-code"), max_length=64, blank=True)
+    postcode = UppercaseCharField(_("Post/Zip-code"), max_length=64, blank=True)
     country = models.ForeignKey(
-        'address.Country',
-        on_delete=models.CASCADE,
-        verbose_name=_("Country"))
+        "address.Country", on_delete=models.CASCADE, verbose_name=_("Country")
+    )
 
     # A field only used for searching addresses - this contains all the
     # `search_fields`.  This is effectively a poor man's Solr text field.
     search_text = models.TextField(
-        _("Search text - used only for searching addresses"), editable=False)
-    search_fields = ['first_name', 'last_name', 'line1', 'line2', 'line3', 'line4', 'state', 'postcode', 'country']
+        _("Search text - used only for searching addresses"), editable=False
+    )
+    search_fields = [
+        "first_name",
+        "last_name",
+        "line1",
+        "line2",
+        "line3",
+        "line4",
+        "state",
+        "postcode",
+        "country",
+    ]
 
     # Fields, used for `summary` property definition and hash generation.
-    base_fields = hash_fields = ['salutation', 'line1', 'line2', 'line3', 'line4', 'state', 'postcode', 'country']
+    base_fields = hash_fields = [
+        "salutation",
+        "line1",
+        "line2",
+        "line3",
+        "line4",
+        "state",
+        "postcode",
+        "country",
+    ]
 
     def __str__(self):
         return self.summary
 
     class Meta:
         abstract = True
-        verbose_name = _('Address')
-        verbose_name_plural = _('Addresses')
+        verbose_name = _("Address")
+        verbose_name_plural = _("Addresses")
 
     # Saving
 
@@ -260,8 +280,16 @@ class AbstractAddress(models.Model):
 
     def clean(self):
         # Strip all whitespace
-        for field in ['first_name', 'last_name', 'line1', 'line2', 'line3',
-                      'line4', 'state', 'postcode']:
+        for field in [
+            "first_name",
+            "last_name",
+            "line1",
+            "line2",
+            "line3",
+            "line4",
+            "state",
+            "postcode",
+        ]:
             if self.__dict__[field]:
                 self.__dict__[field] = self.__dict__[field].strip()
 
@@ -276,27 +304,27 @@ class AbstractAddress(models.Model):
             country_code = self.country.iso_3166_1_a2
             regex = self.POSTCODES_REGEX.get(country_code, None)
             if regex:
-                msg = _("Addresses in %(country)s require a valid postcode") \
-                    % {'country': self.country}
+                msg = _("Addresses in %(country)s require a valid postcode") % {
+                    "country": self.country
+                }
                 raise exceptions.ValidationError(msg)
 
         if self.postcode and self.country_id:
             # Ensure postcodes are always uppercase
-            postcode = self.postcode.upper().replace(' ', '')
+            postcode = self.postcode.upper().replace(" ", "")
             country_code = self.country.iso_3166_1_a2
             regex = self.POSTCODES_REGEX.get(country_code, None)
 
             # Validate postcode against regex for the country if available
             if regex and not re.match(regex, postcode):
-                msg = _("The postcode '%(postcode)s' is not valid "
-                        "for %(country)s") \
-                    % {'postcode': self.postcode,
-                       'country': self.country}
-                raise exceptions.ValidationError(
-                    {'postcode': [msg]})
+                msg = _("The postcode '%(postcode)s' is not valid for %(country)s") % {
+                    "postcode": self.postcode,
+                    "country": self.country,
+                }
+                raise exceptions.ValidationError({"postcode": [msg]})
 
     def _update_search_text(self):
-        self.search_text = self.join_fields(self.search_fields, separator=' ')
+        self.search_text = self.join_fields(self.search_fields, separator=" ")
 
     # Properties
 
@@ -319,12 +347,12 @@ class AbstractAddress(models.Model):
         Name (including title)
         """
         return self.join_fields(
-            ('title', 'first_name', 'last_name'),
-            separator=" ").strip()
+            ("title", "first_name", "last_name"), separator=" "
+        ).strip()
 
     @property
     def name(self):
-        return self.join_fields(('first_name', 'last_name'), separator=" ")
+        return self.join_fields(("first_name", "last_name"), separator=" ")
 
     # Helpers
 
@@ -332,14 +360,14 @@ class AbstractAddress(models.Model):
         field_values = []
         for field in fields:
             # Title is special case
-            if field == 'title':
+            if field == "title":
                 value = self.get_title_display()
-            elif field == 'country':
+            elif field == "country":
                 try:
                     value = self.country.printable_name
                 except exceptions.ObjectDoesNotExist:
-                    value = ''
-            elif field == 'salutation':
+                    value = ""
+            elif field == "salutation":
                 value = self.salutation
             else:
                 value = getattr(self, field)
@@ -362,7 +390,7 @@ class AbstractAddress(models.Model):
         # Python 2 and 3 generates CRC checksum in different ranges, so
         # in order to generate platform-independent value we apply
         # `& 0xffffffff` expression.
-        return zlib.crc32(', '.join(field_values).upper().encode('UTF8')) & 0xffffffff
+        return zlib.crc32(", ".join(field_values).upper().encode("UTF8")) & 0xFFFFFFFF
 
     def join_fields(self, fields, separator=", "):
         """
@@ -379,10 +407,9 @@ class AbstractAddress(models.Model):
         This is used to convert a user address to a shipping address
         as part of the checkout process.
         """
-        destination_field_names = [
-            field.name for field in address_model._meta.fields]
+        destination_field_names = [field.name for field in address_model._meta.fields]
         for field_name in [field.name for field in self._meta.fields]:
-            if field_name in destination_field_names and field_name != 'id':
+            if field_name in destination_field_names and field_name != "id":
                 setattr(address_model, field_name, getattr(self, field_name))
 
     def active_address_fields(self):
@@ -401,32 +428,41 @@ class AbstractCountry(models.Model):
     The field names are a bit awkward, but kept for backwards compatibility.
     pycountry's syntax of alpha2, alpha3, name and official_name seems sane.
     """
+
     iso_3166_1_a2 = models.CharField(
-        _('ISO 3166-1 alpha-2'), max_length=2, primary_key=True)
-    iso_3166_1_a3 = models.CharField(
-        _('ISO 3166-1 alpha-3'), max_length=3, blank=True)
+        _("ISO 3166-1 alpha-2"), max_length=2, primary_key=True
+    )
+    iso_3166_1_a3 = models.CharField(_("ISO 3166-1 alpha-3"), max_length=3, blank=True)
     iso_3166_1_numeric = models.CharField(
-        _('ISO 3166-1 numeric'), blank=True, max_length=3)
+        _("ISO 3166-1 numeric"), blank=True, max_length=3
+    )
 
     #: The commonly used name; e.g. 'United Kingdom'
-    printable_name = models.CharField(_('Country name'), max_length=128, db_index=True)
+    printable_name = models.CharField(_("Country name"), max_length=128, db_index=True)
     #: The full official name of a country
     #: e.g. 'United Kingdom of Great Britain and Northern Ireland'
-    name = models.CharField(_('Official name'), max_length=128)
+    name = models.CharField(_("Official name"), max_length=128)
 
     display_order = models.PositiveSmallIntegerField(
-        _("Display order"), default=0, db_index=True,
-        help_text=_('Higher the number, higher the country in the list.'))
+        _("Display order"),
+        default=0,
+        db_index=True,
+        help_text=_("Higher the number, higher the country in the list."),
+    )
 
     is_shipping_country = models.BooleanField(
-        _("Is shipping country"), default=False, db_index=True)
+        _("Is shipping country"), default=False, db_index=True
+    )
 
     class Meta:
         abstract = True
-        app_label = 'address'
-        verbose_name = _('Country')
-        verbose_name_plural = _('Countries')
-        ordering = ('-display_order', 'printable_name',)
+        app_label = "address"
+        verbose_name = _("Country")
+        verbose_name_plural = _("Countries")
+        ordering = (
+            "-display_order",
+            "printable_name",
+        )
 
     def __str__(self):
         return self.printable_name or self.name
@@ -468,17 +504,20 @@ class AbstractShippingAddress(AbstractAddress):
     """
 
     phone_number = PhoneNumberField(
-        _("Phone number"), blank=True,
-        help_text=_("In case we need to call you about your order"))
+        _("Phone number"),
+        blank=True,
+        help_text=_("In case we need to call you about your order"),
+    )
     notes = models.TextField(
-        blank=True, verbose_name=_('Instructions'),
-        help_text=_("Tell us anything we should know when delivering "
-                    "your order."))
+        blank=True,
+        verbose_name=_("Instructions"),
+        help_text=_("Tell us anything we should know when delivering your order."),
+    )
 
     class Meta:
         abstract = True
         # ShippingAddress is registered in order/models.py
-        app_label = 'order'
+        app_label = "order"
         verbose_name = _("Shipping address")
         verbose_name_plural = _("Shipping addresses")
 
@@ -501,34 +540,41 @@ class AbstractUserAddress(AbstractShippingAddress):
     model, we allow users the ability to add/edit/delete from their address
     book without affecting orders already placed.
     """
+
     user = models.ForeignKey(
         AUTH_USER_MODEL,
         on_delete=models.CASCADE,
-        related_name='addresses',
-        verbose_name=_("User"))
+        related_name="addresses",
+        verbose_name=_("User"),
+    )
 
     #: Whether this address is the default for shipping
     is_default_for_shipping = models.BooleanField(
-        _("Default shipping address?"), default=False)
+        _("Default shipping address?"), default=False
+    )
 
     #: Whether this address should be the default for billing.
     is_default_for_billing = models.BooleanField(
-        _("Default billing address?"), default=False)
+        _("Default billing address?"), default=False
+    )
 
     #: We keep track of the number of times an address has been used
     #: as a shipping address so we can show the most popular ones
     #: first at the checkout.
     num_orders_as_shipping_address = models.PositiveIntegerField(
-        _("Number of Orders as Shipping Address"), default=0)
+        _("Number of Orders as Shipping Address"), default=0
+    )
 
     #: Same as previous, but for billing address.
     num_orders_as_billing_address = models.PositiveIntegerField(
-        _("Number of Orders as Billing Address"), default=0)
+        _("Number of Orders as Billing Address"), default=0
+    )
 
     #: A hash is kept to try and avoid duplicate addresses being added
     #: to the address book.
-    hash = models.CharField(_("Address Hash"), max_length=255, db_index=True,
-                            editable=False)
+    hash = models.CharField(
+        _("Address Hash"), max_length=255, db_index=True, editable=False
+    )
     date_created = models.DateTimeField(_("Date Created"), auto_now_add=True)
 
     def save(self, *args, **kwargs):
@@ -546,40 +592,38 @@ class AbstractUserAddress(AbstractShippingAddress):
 
     def _ensure_defaults_integrity(self):
         if self.is_default_for_shipping:
-            self.__class__._default_manager\
-                .filter(user=self.user, is_default_for_shipping=True)\
-                .update(is_default_for_shipping=False)
+            self.__class__._default_manager.filter(
+                user=self.user, is_default_for_shipping=True
+            ).update(is_default_for_shipping=False)
         if self.is_default_for_billing:
-            self.__class__._default_manager\
-                .filter(user=self.user, is_default_for_billing=True)\
-                .update(is_default_for_billing=False)
+            self.__class__._default_manager.filter(
+                user=self.user, is_default_for_billing=True
+            ).update(is_default_for_billing=False)
 
     class Meta:
         abstract = True
-        app_label = 'address'
+        app_label = "address"
         verbose_name = _("User address")
         verbose_name_plural = _("User addresses")
-        ordering = ['-num_orders_as_shipping_address']
-        unique_together = ('user', 'hash')
+        ordering = ["-num_orders_as_shipping_address"]
+        unique_together = ("user", "hash")
 
     def validate_unique(self, exclude=None):
         super().validate_unique(exclude)
-        qs = self.__class__.objects.filter(
-            user=self.user,
-            hash=self.generate_hash())
+        qs = self.__class__.objects.filter(user=self.user, hash=self.generate_hash())
         if self.id:
             qs = qs.exclude(id=self.id)
         if qs.exists():
-            raise exceptions.ValidationError({
-                '__all__': [_("This address is already in your address"
-                              " book")]})
+            raise exceptions.ValidationError(
+                {"__all__": [_("This address is already in your address book")]}
+            )
 
 
 class AbstractBillingAddress(AbstractAddress):
     class Meta:
         abstract = True
         # BillingAddress is registered in order/models.py
-        app_label = 'order'
+        app_label = "order"
         verbose_name = _("Billing address")
         verbose_name_plural = _("Billing addresses")
 
@@ -596,14 +640,16 @@ class AbstractPartnerAddress(AbstractAddress):
     A partner can have one or more addresses. This can be useful e.g. when
     determining US tax which depends on the origin of the shipment.
     """
+
     partner = models.ForeignKey(
-        'partner.Partner',
+        "partner.Partner",
         on_delete=models.CASCADE,
-        related_name='addresses',
-        verbose_name=_('Partner'))
+        related_name="addresses",
+        verbose_name=_("Partner"),
+    )
 
     class Meta:
         abstract = True
-        app_label = 'partner'
+        app_label = "partner"
         verbose_name = _("Partner address")
         verbose_name_plural = _("Partner addresses")

src/oscar/apps/address/admin.py

@@ -4,24 +4,17 @@ from oscar.core.loading import get_model
 
 
 class UserAddressAdmin(admin.ModelAdmin):
-    readonly_fields = ('num_orders_as_billing_address', 'num_orders_as_shipping_address')
+    readonly_fields = (
+        "num_orders_as_billing_address",
+        "num_orders_as_shipping_address",
+    )
 
 
 class CountryAdmin(admin.ModelAdmin):
-    list_display = [
-        '__str__',
-        'display_order'
-    ]
-    list_filter = [
-        'is_shipping_country'
-    ]
-    search_fields = [
-        'name',
-        'printable_name',
-        'iso_3166_1_a2',
-        'iso_3166_1_a3'
-    ]
+    list_display = ["__str__", "display_order"]
+    list_filter = ["is_shipping_country"]
+    search_fields = ["name", "printable_name", "iso_3166_1_a2", "iso_3166_1_a3"]
 
 
-admin.site.register(get_model('address', 'useraddress'), UserAddressAdmin)
-admin.site.register(get_model('address', 'country'), CountryAdmin)
+admin.site.register(get_model("address", "useraddress"), UserAddressAdmin)
+admin.site.register(get_model("address", "country"), CountryAdmin)

src/oscar/apps/address/apps.py

@@ -4,6 +4,6 @@ from oscar.core.application import OscarConfig
 
 
 class AddressConfig(OscarConfig):
-    label = 'address'
-    name = 'oscar.apps.address'
-    verbose_name = _('Address')
+    label = "address"
+    name = "oscar.apps.address"
+    verbose_name = _("Address")

src/oscar/apps/address/forms.py

@@ -4,31 +4,35 @@ from django.conf import settings
 from oscar.core.loading import get_model
 from oscar.forms.mixins import PhoneNumberMixin
 
-UserAddress = get_model('address', 'useraddress')
+UserAddress = get_model("address", "useraddress")
 
 
 class AbstractAddressForm(forms.ModelForm):
-
     def __init__(self, *args, **kwargs):
         """
         Set fields in OSCAR_REQUIRED_ADDRESS_FIELDS as required.
         """
         super().__init__(*args, **kwargs)
-        field_names = (set(self.fields)
-                       & set(settings.OSCAR_REQUIRED_ADDRESS_FIELDS))
+        field_names = set(self.fields) & set(settings.OSCAR_REQUIRED_ADDRESS_FIELDS)
         for field_name in field_names:
             self.fields[field_name].required = True
 
 
 class UserAddressForm(PhoneNumberMixin, AbstractAddressForm):
-
     class Meta:
         model = UserAddress
         fields = [
-            'first_name', 'last_name',
-            'line1', 'line2', 'line3', 'line4',
-            'state', 'postcode', 'country',
-            'phone_number', 'notes',
+            "first_name",
+            "last_name",
+            "line1",
+            "line2",
+            "line3",
+            "line4",
+            "state",
+            "postcode",
+            "country",
+            "phone_number",
+            "notes",
         ]
 
     def __init__(self, user, *args, **kwargs):

src/oscar/apps/address/models.py

@@ -1,19 +1,20 @@
-from oscar.apps.address.abstract_models import (
-    AbstractCountry, AbstractUserAddress)
+from oscar.apps.address.abstract_models import AbstractCountry, AbstractUserAddress
 from oscar.core.loading import is_model_registered
 
 __all__ = []
 
 
-if not is_model_registered('address', 'UserAddress'):
+if not is_model_registered("address", "UserAddress"):
+
     class UserAddress(AbstractUserAddress):
         pass
 
-    __all__.append('UserAddress')
+    __all__.append("UserAddress")
+
 
+if not is_model_registered("address", "Country"):
 
-if not is_model_registered('address', 'Country'):
     class Country(AbstractCountry):
         pass
 
-    __all__.append('Country')
+    __all__.append("Country")

src/oscar/apps/analytics/__init__.py

@@ -1 +1 @@
-default_app_config = 'oscar.apps.analytics.apps.AnalyticsConfig'
+default_app_config = "oscar.apps.analytics.apps.AnalyticsConfig"

src/oscar/apps/analytics/abstract_models.py

@@ -15,25 +15,28 @@ class AbstractProductRecord(models.Model):
     """
 
     product = models.OneToOneField(
-        'catalogue.Product', verbose_name=_("Product"),
-        related_name='stats', on_delete=models.CASCADE)
+        "catalogue.Product",
+        verbose_name=_("Product"),
+        related_name="stats",
+        on_delete=models.CASCADE,
+    )
 
     # Data used for generating a score
-    num_views = models.PositiveIntegerField(_('Views'), default=0)
-    num_basket_additions = models.PositiveIntegerField(
-        _('Basket Additions'), default=0)
+    num_views = models.PositiveIntegerField(_("Views"), default=0)
+    num_basket_additions = models.PositiveIntegerField(_("Basket Additions"), default=0)
     num_purchases = models.PositiveIntegerField(
-        _('Purchases'), default=0, db_index=True)
+        _("Purchases"), default=0, db_index=True
+    )
 
     # Product score - used within search
-    score = models.FloatField(_('Score'), default=0.00)
+    score = models.FloatField(_("Score"), default=0.00)
 
     class Meta:
         abstract = True
-        app_label = 'analytics'
-        ordering = ['-num_purchases']
-        verbose_name = _('Product record')
-        verbose_name_plural = _('Product records')
+        app_label = "analytics"
+        ordering = ["-num_purchases"]
+        verbose_name = _("Product record")
+        verbose_name_plural = _("Product records")
 
     def __str__(self):
         return _("Record for '%s'") % self.product
@@ -44,74 +47,73 @@ class AbstractUserRecord(models.Model):
     A record of a user's activity.
     """
 
-    user = models.OneToOneField(AUTH_USER_MODEL, verbose_name=_("User"),
-                                on_delete=models.CASCADE)
+    user = models.OneToOneField(
+        AUTH_USER_MODEL, verbose_name=_("User"), on_delete=models.CASCADE
+    )
 
     # Browsing stats
-    num_product_views = models.PositiveIntegerField(
-        _('Product Views'), default=0)
-    num_basket_additions = models.PositiveIntegerField(
-        _('Basket Additions'), default=0)
+    num_product_views = models.PositiveIntegerField(_("Product Views"), default=0)
+    num_basket_additions = models.PositiveIntegerField(_("Basket Additions"), default=0)
 
     # Order stats
-    num_orders = models.PositiveIntegerField(
-        _('Orders'), default=0, db_index=True)
+    num_orders = models.PositiveIntegerField(_("Orders"), default=0, db_index=True)
     num_order_lines = models.PositiveIntegerField(
-        _('Order Lines'), default=0, db_index=True)
+        _("Order Lines"), default=0, db_index=True
+    )
     num_order_items = models.PositiveIntegerField(
-        _('Order Items'), default=0, db_index=True)
-    total_spent = models.DecimalField(_('Total Spent'), decimal_places=2,
-                                      max_digits=12, default=Decimal('0.00'))
-    date_last_order = models.DateTimeField(
-        _('Last Order Date'), blank=True, null=True)
+        _("Order Items"), default=0, db_index=True
+    )
+    total_spent = models.DecimalField(
+        _("Total Spent"), decimal_places=2, max_digits=12, default=Decimal("0.00")
+    )
+    date_last_order = models.DateTimeField(_("Last Order Date"), blank=True, null=True)
 
     class Meta:
         abstract = True
-        app_label = 'analytics'
-        verbose_name = _('User record')
-        verbose_name_plural = _('User records')
+        app_label = "analytics"
+        verbose_name = _("User record")
+        verbose_name_plural = _("User records")
 
 
 class AbstractUserProductView(models.Model):
-
     user = models.ForeignKey(
-        AUTH_USER_MODEL, verbose_name=_("User"),
-        on_delete=models.CASCADE)
+        AUTH_USER_MODEL, verbose_name=_("User"), on_delete=models.CASCADE
+    )
     product = models.ForeignKey(
-        'catalogue.Product',
-        on_delete=models.CASCADE,
-        verbose_name=_("Product"))
+        "catalogue.Product", on_delete=models.CASCADE, verbose_name=_("Product")
+    )
     date_created = models.DateTimeField(_("Date Created"), auto_now_add=True)
 
     class Meta:
         abstract = True
-        app_label = 'analytics'
-        ordering = ['-pk']
-        verbose_name = _('User product view')
-        verbose_name_plural = _('User product views')
+        app_label = "analytics"
+        ordering = ["-pk"]
+        verbose_name = _("User product view")
+        verbose_name_plural = _("User product views")
 
     def __str__(self):
         return _("%(user)s viewed '%(product)s'") % {
-            'user': self.user, 'product': self.product}
+            "user": self.user,
+            "product": self.product,
+        }
 
 
 class AbstractUserSearch(models.Model):
-
     user = models.ForeignKey(
-        AUTH_USER_MODEL,
-        on_delete=models.CASCADE,
-        verbose_name=_("User"))
+        AUTH_USER_MODEL, on_delete=models.CASCADE, verbose_name=_("User")
+    )
     query = models.CharField(_("Search term"), max_length=255, db_index=True)
     date_created = models.DateTimeField(_("Date Created"), auto_now_add=True)
 
     class Meta:
         abstract = True
-        app_label = 'analytics'
-        ordering = ['-pk']
+        app_label = "analytics"
+        ordering = ["-pk"]
         verbose_name = _("User search query")
         verbose_name_plural = _("User search queries")
 
     def __str__(self):
         return _("%(user)s searched for '%(query)s'") % {
-            'user': self.user,
-            'query': self.query}
+            "user": self.user,
+            "query": self.query,
+        }

src/oscar/apps/analytics/admin.py

@@ -4,22 +4,25 @@ from oscar.core.loading import get_model
 
 
 class ProductRecordAdmin(admin.ModelAdmin):
-    list_display = ('product', 'num_views', 'num_basket_additions',
-                    'num_purchases')
+    list_display = ("product", "num_views", "num_basket_additions", "num_purchases")
 
 
 class UserProductViewAdmin(admin.ModelAdmin):
-    list_display = ('user', 'product', 'date_created')
+    list_display = ("user", "product", "date_created")
 
 
 class UserRecordAdmin(admin.ModelAdmin):
-    list_display = ('user', 'num_product_views', 'num_basket_additions',
-                    'num_orders', 'total_spent', 'date_last_order')
-
-
-admin.site.register(get_model('analytics', 'productrecord'),
-                    ProductRecordAdmin)
-admin.site.register(get_model('analytics', 'userrecord'), UserRecordAdmin)
-admin.site.register(get_model('analytics', 'usersearch'))
-admin.site.register(get_model('analytics', 'userproductview'),
-                    UserProductViewAdmin)
+    list_display = (
+        "user",
+        "num_product_views",
+        "num_basket_additions",
+        "num_orders",
+        "total_spent",
+        "date_last_order",
+    )
+
+
+admin.site.register(get_model("analytics", "productrecord"), ProductRecordAdmin)
+admin.site.register(get_model("analytics", "userrecord"), UserRecordAdmin)
+admin.site.register(get_model("analytics", "usersearch"))
+admin.site.register(get_model("analytics", "userproductview"), UserProductViewAdmin)

src/oscar/apps/analytics/apps.py

@@ -4,9 +4,10 @@ from oscar.core.application import OscarConfig
 
 
 class AnalyticsConfig(OscarConfig):
-    label = 'analytics'
-    name = 'oscar.apps.analytics'
-    verbose_name = _('Analytics')
+    label = "analytics"
+    name = "oscar.apps.analytics"
+    verbose_name = _("Analytics")
 
+    # pylint: disable=unused-import
     def ready(self):
-        from . import receivers  # noqa
+        from . import receivers

src/oscar/apps/analytics/models.py

@@ -1,34 +1,41 @@
 from oscar.apps.analytics.abstract_models import (
-    AbstractProductRecord, AbstractUserProductView,
-    AbstractUserRecord, AbstractUserSearch)
+    AbstractProductRecord,
+    AbstractUserProductView,
+    AbstractUserRecord,
+    AbstractUserSearch,
+)
 from oscar.core.loading import is_model_registered
 
 __all__ = []
 
 
-if not is_model_registered('analytics', 'ProductRecord'):
+if not is_model_registered("analytics", "ProductRecord"):
+
     class ProductRecord(AbstractProductRecord):
         pass
 
-    __all__.append('ProductRecord')
+    __all__.append("ProductRecord")
+
 
+if not is_model_registered("analytics", "UserRecord"):
 
-if not is_model_registered('analytics', 'UserRecord'):
     class UserRecord(AbstractUserRecord):
         pass
 
-    __all__.append('UserRecord')
+    __all__.append("UserRecord")
 
 
-if not is_model_registered('analytics', 'UserProductView'):
+if not is_model_registered("analytics", "UserProductView"):
+
     class UserProductView(AbstractUserProductView):
         pass
 
-    __all__.append('UserProductView')
+    __all__.append("UserProductView")
+
 
+if not is_model_registered("analytics", "UserSearch"):
 
-if not is_model_registered('analytics', 'UserSearch'):
     class UserSearch(AbstractUserSearch):
         pass
 
-    __all__.append('UserSearch')
+    __all__.append("UserSearch")

src/oscar/apps/analytics/receivers.py

@@ -10,14 +10,14 @@ from oscar.apps.order.signals import order_placed
 from oscar.apps.search.signals import user_search
 from oscar.core.loading import get_model
 
-ProductRecord = get_model('analytics', 'ProductRecord')
-UserProductView = get_model('analytics', 'UserProductView')
-UserRecord = get_model('analytics', 'UserRecord')
-UserSearch = get_model('analytics', 'UserSearch')
+ProductRecord = get_model("analytics", "ProductRecord")
+UserProductView = get_model("analytics", "UserProductView")
+UserRecord = get_model("analytics", "UserRecord")
+UserSearch = get_model("analytics", "UserSearch")
 
 # Helpers
 
-logger = logging.getLogger('oscar.analytics')
+logger = logging.getLogger("oscar.analytics")
 
 
 def _update_counter(model, field_name, filter_kwargs, increment=1):
@@ -38,72 +38,78 @@ def _update_counter(model, field_name, filter_kwargs, increment=1):
         if not affected:
             filter_kwargs[field_name] = increment
             model.objects.create(**filter_kwargs)
-    except IntegrityError:      # pragma: no cover
+    except IntegrityError:  # pragma: no cover
         # get_or_create has a race condition (we should use upsert in supported)
         # databases. For now just ignore these errors
-        logger.error(
-            "IntegrityError when updating analytics counter for %s", model)
+        logger.error("IntegrityError when updating analytics counter for %s", model)
 
 
 def _record_products_in_order(order):
     # surely there's a way to do this without causing a query for each line?
     for line in order.lines.all():
         _update_counter(
-            ProductRecord, 'num_purchases',
-            {'product': line.product}, line.quantity)
+            ProductRecord, "num_purchases", {"product": line.product}, line.quantity
+        )
 
 
 def _record_user_order(user, order):
     try:
         record = UserRecord.objects.filter(user=user)
         affected = record.update(
-            num_orders=F('num_orders') + 1,
-            num_order_lines=F('num_order_lines') + order.num_lines,
-            num_order_items=F('num_order_items') + order.num_items,
-            total_spent=F('total_spent') + order.total_incl_tax,
-            date_last_order=order.date_placed)
+            num_orders=F("num_orders") + 1,
+            num_order_lines=F("num_order_lines") + order.num_lines,
+            num_order_items=F("num_order_items") + order.num_items,
+            total_spent=F("total_spent") + order.total_incl_tax,
+            date_last_order=order.date_placed,
+        )
         if not affected:
             UserRecord.objects.create(
-                user=user, num_orders=1, num_order_lines=order.num_lines,
+                user=user,
+                num_orders=1,
+                num_order_lines=order.num_lines,
                 num_order_items=order.num_items,
                 total_spent=order.total_incl_tax,
-                date_last_order=order.date_placed)
-    except IntegrityError:      # pragma: no cover
-        logger.error(
-            "IntegrityError in analytics when recording a user order.")
+                date_last_order=order.date_placed,
+            )
+    except IntegrityError:  # pragma: no cover
+        logger.error("IntegrityError in analytics when recording a user order.")
 
 
 # Receivers
 
+
+# pylint: disable=unused-argument
 @receiver(product_viewed)
 def receive_product_view(sender, product, user, **kwargs):
-    if kwargs.get('raw', False):
+    if kwargs.get("raw", False):
         return
-    _update_counter(ProductRecord, 'num_views', {'product': product})
+    _update_counter(ProductRecord, "num_views", {"product": product})
     if user and user.is_authenticated:
-        _update_counter(UserRecord, 'num_product_views', {'user': user})
+        _update_counter(UserRecord, "num_product_views", {"user": user})
         UserProductView.objects.create(product=product, user=user)
 
 
+# pylint: disable=unused-argument
 @receiver(user_search)
 def receive_product_search(sender, query, user, **kwargs):
-    if user and user.is_authenticated and not kwargs.get('raw', False):
+    if user and user.is_authenticated and not kwargs.get("raw", False):
         UserSearch._default_manager.create(user=user, query=query)
 
 
+# pylint: disable=unused-argument
 @receiver(basket_addition)
 def receive_basket_addition(sender, product, user, **kwargs):
-    if kwargs.get('raw', False):
+    if kwargs.get("raw", False):
         return
-    _update_counter(
-        ProductRecord, 'num_basket_additions', {'product': product})
+    _update_counter(ProductRecord, "num_basket_additions", {"product": product})
     if user and user.is_authenticated:
-        _update_counter(UserRecord, 'num_basket_additions', {'user': user})
+        _update_counter(UserRecord, "num_basket_additions", {"user": user})
 
 
+# pylint: disable=unused-argument
 @receiver(order_placed)
 def receive_order_placed(sender, order, user, **kwargs):
-    if kwargs.get('raw', False):
+    if kwargs.get("raw", False):
         return
     _record_products_in_order(order)
     if user and user.is_authenticated:

src/oscar/apps/analytics/reports.py

@@ -2,46 +2,44 @@ 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')
-ReportHTMLFormatter = get_class('dashboard.reports.reports',
-                                'ReportHTMLFormatter')
-ProductRecord = get_model('analytics', 'ProductRecord')
-UserRecord = get_model('analytics', 'UserRecord')
+ReportGenerator = get_class("dashboard.reports.reports", "ReportGenerator")
+ReportCSVFormatter = get_class("dashboard.reports.reports", "ReportCSVFormatter")
+ReportHTMLFormatter = get_class("dashboard.reports.reports", "ReportHTMLFormatter")
+ProductRecord = get_model("analytics", "ProductRecord")
+UserRecord = get_model("analytics", "UserRecord")
 
 
 class ProductReportCSVFormatter(ReportCSVFormatter):
-    filename_template = 'conditional-offer-performance.csv'
+    filename_template = "conditional-offer-performance.csv"
 
     def generate_csv(self, response, products):
         writer = self.get_csv_writer(response)
-        header_row = [_('Product'),
-                      _('Views'),
-                      _('Basket additions'),
-                      _('Purchases')]
+        header_row = [_("Product"), _("Views"), _("Basket additions"), _("Purchases")]
         writer.writerow(header_row)
 
         for record in products:
-            row = [record.product,
-                   record.num_views,
-                   record.num_basket_additions,
-                   record.num_purchases]
+            row = [
+                record.product,
+                record.num_views,
+                record.num_basket_additions,
+                record.num_purchases,
+            ]
             writer.writerow(row)
 
 
 class ProductReportHTMLFormatter(ReportHTMLFormatter):
-    filename_template = 'oscar/dashboard/reports/partials/product_report.html'
+    filename_template = "oscar/dashboard/reports/partials/product_report.html"
 
 
 class ProductReportGenerator(ReportGenerator):
-    code = 'product_analytics'
-    description = _('Product analytics')
+    code = "product_analytics"
+    description = _("Product analytics")
     model_class = ProductRecord
 
     formatters = {
-        'CSV_formatter': ProductReportCSVFormatter,
-        'HTML_formatter': ProductReportHTMLFormatter}
+        "CSV_formatter": ProductReportCSVFormatter,
+        "HTML_formatter": ProductReportHTMLFormatter,
+    }
 
     def report_description(self):
         return self.description
@@ -51,46 +49,51 @@ class ProductReportGenerator(ReportGenerator):
 
 
 class UserReportCSVFormatter(ReportCSVFormatter):
-    filename_template = 'user-analytics.csv'
+    filename_template = "user-analytics.csv"
 
     def generate_csv(self, response, users):
         writer = self.get_csv_writer(response)
-        header_row = [_('Name'),
-                      _('Date registered'),
-                      _('Product views'),
-                      _('Basket additions'),
-                      _('Orders'),
-                      _('Order lines'),
-                      _('Order items'),
-                      _('Total spent'),
-                      _('Date of last order')]
+        header_row = [
+            _("Name"),
+            _("Date registered"),
+            _("Product views"),
+            _("Basket additions"),
+            _("Orders"),
+            _("Order lines"),
+            _("Order items"),
+            _("Total spent"),
+            _("Date of last order"),
+        ]
         writer.writerow(header_row)
 
         for record in users:
-            row = [record.user.get_full_name(),
-                   self.format_date(record.user.date_joined),
-                   record.num_product_views,
-                   record.num_basket_additions,
-                   record.num_orders,
-                   record.num_order_lines,
-                   record.num_order_items,
-                   record.total_spent,
-                   self.format_datetime(record.date_last_order)]
+            row = [
+                record.user.get_full_name(),
+                self.format_date(record.user.date_joined),
+                record.num_product_views,
+                record.num_basket_additions,
+                record.num_orders,
+                record.num_order_lines,
+                record.num_order_items,
+                record.total_spent,
+                self.format_datetime(record.date_last_order),
+            ]
             writer.writerow(row)
 
 
 class UserReportHTMLFormatter(ReportHTMLFormatter):
-    filename_template = 'oscar/dashboard/reports/partials/user_report.html'
+    filename_template = "oscar/dashboard/reports/partials/user_report.html"
 
 
 class UserReportGenerator(ReportGenerator):
-    code = 'user_analytics'
-    description = _('User analytics')
+    code = "user_analytics"
+    description = _("User analytics")
     queryset = UserRecord._default_manager.select_related().all()
 
     formatters = {
-        'CSV_formatter': UserReportCSVFormatter,
-        'HTML_formatter': UserReportHTMLFormatter}
+        "CSV_formatter": UserReportCSVFormatter,
+        "HTML_formatter": UserReportHTMLFormatter,
+    }
 
     def is_available_to(self, user):
         return user.is_staff

src/oscar/apps/analytics/scores.py

@@ -2,17 +2,12 @@ from django.db.models import F
 
 from oscar.core.loading import get_model
 
-ProductRecord = get_model('analytics', 'ProductRecord')
+ProductRecord = get_model("analytics", "ProductRecord")
 
 
 class Calculator(object):
-
     # Map of field name to weight
-    weights = {
-        'num_views': 1,
-        'num_basket_additions': 3,
-        'num_purchases': 5
-    }
+    weights = {"num_views": 1, "num_basket_additions": 3, "num_purchases": 5}
 
     def __init__(self, logger):
         self.logger = logger
@@ -23,7 +18,5 @@ class Calculator(object):
     def calculate_scores(self):
         self.logger.info("Calculating product scores")
         total_weight = float(sum(self.weights.values()))
-        weighted_fields = [
-            self.weights[name] * F(name) for name in self.weights.keys()]
-        ProductRecord.objects.update(
-            score=sum(weighted_fields) / total_weight)
+        weighted_fields = [self.weights[name] * F(name) for name in self.weights.keys()]
+        ProductRecord.objects.update(score=sum(weighted_fields) / total_weight)

src/oscar/apps/basket/__init__.py

@@ -1 +1 @@
-default_app_config = 'oscar.apps.basket.apps.BasketConfig'
+default_app_config = "oscar.apps.basket.apps.BasketConfig"

src/oscar/apps/basket/abstract_models.py

@@ -17,30 +17,39 @@ from oscar.core.utils import get_default_currency, round_half_up
 from oscar.models.fields.slugfield import SlugField
 from oscar.templatetags.currency_filters import currency
 
-OfferApplications = get_class('offer.results', 'OfferApplications')
-Unavailable = get_class('partner.availability', 'Unavailable')
-LineOfferConsumer = get_class('basket.utils', 'LineOfferConsumer')
-OpenBasketManager, SavedBasketManager = get_classes('basket.managers', ['OpenBasketManager', 'SavedBasketManager'])
+OfferApplications = get_class("offer.results", "OfferApplications")
+Unavailable = get_class("partner.availability", "Unavailable")
+LineOfferConsumer = get_class("basket.utils", "LineOfferConsumer")
+OpenBasketManager, SavedBasketManager = get_classes(
+    "basket.managers", ["OpenBasketManager", "SavedBasketManager"]
+)
 
 
 class AbstractBasket(models.Model):
     """
     Basket object
     """
+
     # Baskets can be anonymously owned - hence this field is nullable.  When a
     # anon user signs in, their two baskets are merged.
     owner = models.ForeignKey(
         AUTH_USER_MODEL,
         null=True,
-        related_name='baskets',
+        related_name="baskets",
         on_delete=models.CASCADE,
-        verbose_name=_("Owner"))
+        verbose_name=_("Owner"),
+    )
 
     # Basket statuses
     # - Frozen is for when a basket is in the process of being submitted
     #   and we need to prevent any changes to it.
     OPEN, MERGED, SAVED, FROZEN, SUBMITTED = (
-        "Open", "Merged", "Saved", "Frozen", "Submitted")
+        "Open",
+        "Merged",
+        "Saved",
+        "Frozen",
+        "Submitted",
+    )
     STATUS_CHOICES = (
         (OPEN, _("Open - currently active")),
         (MERGED, _("Merged - superceded by another basket")),
@@ -49,27 +58,28 @@ class AbstractBasket(models.Model):
         (SUBMITTED, _("Submitted - has been ordered at the checkout")),
     )
     status = models.CharField(
-        _("Status"), max_length=128, default=OPEN, choices=STATUS_CHOICES)
+        _("Status"), max_length=128, default=OPEN, choices=STATUS_CHOICES
+    )
 
     # A basket can have many vouchers attached to it.  However, it is common
     # for sites to only allow one voucher per basket - this will need to be
     # enforced in the project's codebase.
     vouchers = models.ManyToManyField(
-        'voucher.Voucher', verbose_name=_("Vouchers"), blank=True)
+        "voucher.Voucher", verbose_name=_("Vouchers"), blank=True
+    )
 
     date_created = models.DateTimeField(_("Date created"), auto_now_add=True)
     date_merged = models.DateTimeField(_("Date merged"), null=True, blank=True)
-    date_submitted = models.DateTimeField(_("Date submitted"), null=True,
-                                          blank=True)
+    date_submitted = models.DateTimeField(_("Date submitted"), null=True, blank=True)
 
     # Only if a basket is in one of these statuses can it be edited
     editable_statuses = (OPEN, SAVED)
 
     class Meta:
         abstract = True
-        app_label = 'basket'
-        verbose_name = _('Basket')
-        verbose_name_plural = _('Baskets')
+        app_label = "basket"
+        verbose_name = _("Basket")
+        verbose_name_plural = _("Baskets")
 
     objects = models.Manager()
     open = OpenBasketManager()
@@ -87,11 +97,11 @@ class AbstractBasket(models.Model):
         self.offer_applications = OfferApplications()
 
     def __str__(self):
-        return _(
-            "%(status)s basket (owner: %(owner)s, lines: %(num_lines)d)") \
-            % {'status': self.status,
-               'owner': self.owner,
-               'num_lines': self.num_lines}
+        return _("%(status)s basket (owner: %(owner)s, lines: %(num_lines)d)") % {
+            "status": self.status,
+            "owner": self.owner,
+            "num_lines": self.num_lines,
+        }
 
     # ========
     # Strategy
@@ -99,7 +109,7 @@ class AbstractBasket(models.Model):
 
     @property
     def has_strategy(self):
-        return hasattr(self, '_strategy')
+        return hasattr(self, "_strategy")
 
     def _get_strategy(self):
         if not self.has_strategy:
@@ -113,7 +123,7 @@ class AbstractBasket(models.Model):
         return self._strategy
 
     def _set_strategy(self, strategy):
-        self._strategy = strategy
+        self._strategy = strategy  # pylint: disable=W0201
 
     strategy = property(_get_strategy, _set_strategy)
 
@@ -126,14 +136,13 @@ class AbstractBasket(models.Model):
         lost.
         """
         if self.id is None:
-            return self.lines.model.objects.none()
+            return self.lines.model.objects.none()  # pylint: disable=E1101
         if self._lines is None:
             self._lines = (
-                self.lines
-                .select_related('product', 'stockrecord')
-                .prefetch_related(
-                    'attributes', 'product__images')
-                .order_by(self._meta.pk.name))
+                self.lines.select_related("product", "stockrecord")
+                .prefetch_related("attributes", "product__images")
+                .order_by(self._meta.pk.name)
+            )
         return self._lines
 
     def max_allowed_quantity(self):
@@ -157,27 +166,34 @@ class AbstractBasket(models.Model):
         max_allowed, basket_threshold = self.max_allowed_quantity()
 
         if line is not None:
-            line_purchase_permitted, reason = line.purchase_info.availability.is_purchase_permitted(qty)
+            (
+                line_purchase_permitted,
+                reason,
+            ) = line.purchase_info.availability.is_purchase_permitted(qty)
 
             if not line_purchase_permitted:
                 return line_purchase_permitted, reason
 
             # Also check if it's permitted with potentional other lines of the same product & stocrecord
             total_lines_quantity = self.basket_quantity(line) + qty
-            line_purchase_permitted, reason = line.purchase_info.availability.is_purchase_permitted(
-                total_lines_quantity)
+            (
+                line_purchase_permitted,
+                reason,
+            ) = line.purchase_info.availability.is_purchase_permitted(
+                total_lines_quantity
+            )
 
             if not line_purchase_permitted:
                 return line_purchase_permitted, _(
                     "Available stock is only %(max)d, which has been exceeded because "
                     "multiple lines contain the same product."
-                ) % {'max': line.purchase_info.availability.num_available}
+                ) % {"max": line.purchase_info.availability.num_available}
 
         if max_allowed is not None and qty > max_allowed:
             return False, _(
                 "Due to technical limitations we are not able "
-                "to ship more than %(threshold)d items in one order.") \
-                % {'threshold': basket_threshold}
+                "to ship more than %(threshold)d items in one order."
+            ) % {"threshold": basket_threshold}
 
         return True, None
 
@@ -187,8 +203,9 @@ class AbstractBasket(models.Model):
         stockrecord, but different options. Those quantities are summed up.
         """
         matching_lines = self.lines.filter(stockrecord=line.stockrecord)
-        quantity = matching_lines.aggregate(Sum('quantity'))['quantity__sum']
+        quantity = matching_lines.aggregate(Sum("quantity"))["quantity__sum"]
         return quantity or 0
+
     # ============
     # Manipulation
     # ============
@@ -202,6 +219,7 @@ class AbstractBasket(models.Model):
         self.lines.all().delete()
         self._lines = None
 
+    # pylint: disable=unused-argument
     def get_stock_info(self, product, options):
         """
         Hook for implementing strategies that depend on product options
@@ -233,44 +251,51 @@ class AbstractBasket(models.Model):
         stock_info = self.get_stock_info(product, options)
 
         if not stock_info.price.exists:
-            raise ValueError(
-                "Strategy hasn't found a price for product %s" % product)
+            raise ValueError("Strategy hasn't found a price for product %s" % product)
 
         if price_currency and stock_info.price.currency != price_currency:
-            raise ValueError((
-                "Basket lines must all have the same currency. Proposed "
-                "line has currency %s, while basket has currency %s")
-                % (stock_info.price.currency, price_currency))
+            raise ValueError(
+                (
+                    "Basket lines must all have the same currency. Proposed "
+                    "line has currency %s, while basket has currency %s"
+                )
+                % (stock_info.price.currency, price_currency)
+            )
 
         if stock_info.stockrecord is None:
-            raise ValueError((
-                "Basket lines must all have stock records. Strategy hasn't "
-                "found any stock record for product %s") % product)
+            raise ValueError(
+                (
+                    "Basket lines must all have stock records. Strategy hasn't "
+                    "found any stock record for product %s"
+                )
+                % product
+            )
 
         # Line reference is used to distinguish between variations of the same
         # product (eg T-shirts with different personalisations)
-        line_ref = self._create_line_reference(
-            product, stock_info.stockrecord, options)
+        line_ref = self._create_line_reference(product, stock_info.stockrecord, options)
 
         # Determine price to store (if one exists).  It is only stored for
         # audit and sometimes caching.
         defaults = {
-            'quantity': quantity,
-            'price_excl_tax': stock_info.price.excl_tax,
-            'price_currency': stock_info.price.currency,
+            "quantity": quantity,
+            "price_excl_tax": stock_info.price.excl_tax,
+            "price_currency": stock_info.price.currency,
         }
         if stock_info.price.is_tax_known:
-            defaults['price_incl_tax'] = stock_info.price.incl_tax
+            defaults["price_incl_tax"] = stock_info.price.incl_tax
 
         line, created = self.lines.get_or_create(
             line_reference=line_ref,
             product=product,
             stockrecord=stock_info.stockrecord,
-            defaults=defaults)
+            defaults=defaults,
+        )
         if created:
             for option_dict in options:
-                line.attributes.create(option=option_dict['option'],
-                                       value=option_dict['value'])
+                line.attributes.create(
+                    option=option_dict["option"], value=option_dict["value"]
+                )
         else:
             line.quantity = max(0, line.quantity + quantity)
             line.save()
@@ -278,6 +303,7 @@ class AbstractBasket(models.Model):
 
         # Returning the line is useful when overriding this method.
         return line, created
+
     add_product.alters_data = True
     add = add_product
 
@@ -315,12 +341,12 @@ class AbstractBasket(models.Model):
             if add_quantities:
                 existing_line.quantity += line.quantity
             else:
-                existing_line.quantity = max(existing_line.quantity,
-                                             line.quantity)
+                existing_line.quantity = max(existing_line.quantity, line.quantity)
             existing_line.save()
             line.delete()
         finally:
             self._lines = None
+
     merge_line.alters_data = True
 
     def merge(self, basket, add_quantities=True):
@@ -342,6 +368,7 @@ class AbstractBasket(models.Model):
         for voucher in basket.vouchers.all():
             basket.vouchers.remove(voucher)
             self.vouchers.add(voucher)
+
     merge.alters_data = True
 
     def freeze(self):
@@ -350,6 +377,7 @@ class AbstractBasket(models.Model):
         """
         self.status = self.FROZEN
         self.save()
+
     freeze.alters_data = True
 
     def thaw(self):
@@ -358,6 +386,7 @@ class AbstractBasket(models.Model):
         """
         self.status = self.OPEN
         self.save()
+
     thaw.alters_data = True
 
     def submit(self):
@@ -367,6 +396,7 @@ class AbstractBasket(models.Model):
         self.status = self.SUBMITTED
         self.date_submitted = now()
         self.save()
+
     submit.alters_data = True
 
     # Kept for backwards compatibility
@@ -391,23 +421,25 @@ class AbstractBasket(models.Model):
         Returns a reference string for a line based on the item
         and its options.
         """
-        base = '%s_%s' % (product.id, stockrecord.id)
+        base = "%s_%s" % (product.id, stockrecord.id)
         if not options:
             return base
-        repr_options = [{'option': repr(option['option']),
-                         'value': repr(option['value'])} for option in options]
-        repr_options.sort(key=itemgetter('option'))
-        return "%s_%s" % (base, zlib.crc32(repr(repr_options).encode('utf8')))
+        repr_options = [
+            {"option": repr(option["option"]), "value": repr(option["value"])}
+            for option in options
+        ]
+        repr_options.sort(key=itemgetter("option"))
+        return "%s_%s" % (base, zlib.crc32(repr(repr_options).encode("utf8")))
 
-    def _get_total(self, property):
+    def _get_total(self, model_property):
         """
         For executing a named method on each line of the basket
         and returning the total.
         """
-        total = D('0.00')
+        total = D("0.00")
         for line in self.all_lines():
             try:
-                total += getattr(line, property)
+                total += getattr(line, model_property)
             except ObjectDoesNotExist:
                 # Handle situation where the product may have been deleted
                 pass
@@ -416,7 +448,6 @@ class AbstractBasket(models.Model):
                 info = self.get_stock_info(line.product, line.attributes.all())
                 if info.availability.is_available_to_buy:
                     raise
-                pass
         return total
 
     # ==========
@@ -442,30 +473,30 @@ class AbstractBasket(models.Model):
         """
         Return total line price excluding tax
         """
-        return self._get_total('line_price_excl_tax_incl_discounts')
+        return self._get_total("line_price_excl_tax_incl_discounts")
 
     @property
     def total_tax(self):
         """Return total tax for a line"""
-        return self._get_total('line_tax')
+        return self._get_total("line_tax")
 
     @property
     def total_incl_tax(self):
         """
         Return total price inclusive of tax and discounts
         """
-        return self._get_total('line_price_incl_tax_incl_discounts')
+        return self._get_total("line_price_incl_tax_incl_discounts")
 
     @property
     def total_incl_tax_excl_discounts(self):
         """
         Return total price inclusive of tax but exclusive discounts
         """
-        return self._get_total('line_price_incl_tax')
+        return self._get_total("line_price_incl_tax")
 
     @property
     def total_discount(self):
-        return self._get_total('discount_value')
+        return self._get_total("discount_value")
 
     @property
     def offer_discounts(self):
@@ -513,7 +544,7 @@ class AbstractBasket(models.Model):
         """
         Return total price excluding tax and discounts
         """
-        return self._get_total('line_price_excl_tax')
+        return self._get_total("line_price_excl_tax")
 
     @property
     def num_lines(self):
@@ -601,7 +632,7 @@ class AbstractBasket(models.Model):
         """
         if self.id:
             matching_lines = self.lines.filter(product=product)
-            quantity = matching_lines.aggregate(Sum('quantity'))['quantity__sum']
+            quantity = matching_lines.aggregate(Sum("quantity"))["quantity__sum"]
             return quantity or 0
 
         return 0
@@ -638,76 +669,83 @@ class AbstractLine(models.Model):
            their primary key, so no changes should be necessary there.
 
     """
+
     basket = models.ForeignKey(
-        'basket.Basket',
+        "basket.Basket",
         on_delete=models.CASCADE,
-        related_name='lines',
-        verbose_name=_("Basket"))
+        related_name="lines",
+        verbose_name=_("Basket"),
+    )
 
     # This is to determine which products belong to the same line
     # We can't just use product.id as you can have customised products
     # which should be treated as separate lines.  Set as a
     # SlugField as it is included in the path for certain views.
-    line_reference = SlugField(
-        _("Line Reference"), max_length=128, db_index=True)
+    line_reference = SlugField(_("Line Reference"), max_length=128, db_index=True)
 
     product = models.ForeignKey(
-        'catalogue.Product',
+        "catalogue.Product",
         on_delete=models.CASCADE,
-        related_name='basket_lines',
-        verbose_name=_("Product"))
+        related_name="basket_lines",
+        verbose_name=_("Product"),
+    )
 
     # We store the stockrecord that should be used to fulfil this line.
     stockrecord = models.ForeignKey(
-        'partner.StockRecord',
-        on_delete=models.CASCADE,
-        related_name='basket_lines')
+        "partner.StockRecord", on_delete=models.CASCADE, related_name="basket_lines"
+    )
 
-    quantity = models.PositiveIntegerField(_('Quantity'), default=1)
+    quantity = models.PositiveIntegerField(_("Quantity"), default=1)
 
     # We store the unit price incl tax of the product when it is first added to
     # the basket.  This allows us to tell if a product has changed price since
     # a person first added it to their basket.
     price_currency = models.CharField(
-        _("Currency"), max_length=12, default=get_default_currency)
+        _("Currency"), max_length=12, default=get_default_currency
+    )
     price_excl_tax = models.DecimalField(
-        _('Price excl. Tax'), decimal_places=2, max_digits=12,
-        null=True)
+        _("Price excl. Tax"), decimal_places=2, max_digits=12, null=True
+    )
     price_incl_tax = models.DecimalField(
-        _('Price incl. Tax'), decimal_places=2, max_digits=12, null=True)
+        _("Price incl. Tax"), decimal_places=2, max_digits=12, null=True
+    )
 
     # Track date of first addition
-    date_created = models.DateTimeField(_("Date Created"), auto_now_add=True, db_index=True)
+    date_created = models.DateTimeField(
+        _("Date Created"), auto_now_add=True, db_index=True
+    )
     date_updated = models.DateTimeField(_("Date Updated"), auto_now=True, db_index=True)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         # Instance variables used to persist discount information
-        self._discount_excl_tax = D('0.00')
-        self._discount_incl_tax = D('0.00')
+        self._discount_excl_tax = D("0.00")
+        self._discount_incl_tax = D("0.00")
         self.consumer = LineOfferConsumer(self)
 
     class Meta:
         abstract = True
-        app_label = 'basket'
+        app_label = "basket"
         # Enforce sorting by order of creation.
-        ordering = ['date_created', 'pk']
+        ordering = ["date_created", "pk"]
         unique_together = ("basket", "line_reference")
-        verbose_name = _('Basket line')
-        verbose_name_plural = _('Basket lines')
+        verbose_name = _("Basket line")
+        verbose_name_plural = _("Basket lines")
 
     def __str__(self):
         return _(
-            "Basket #%(basket_id)d, Product #%(product_id)d, quantity"
-            " %(quantity)d") % {'basket_id': self.basket.pk,
-                                'product_id': self.product.pk,
-                                'quantity': self.quantity}
+            "Basket #%(basket_id)d, Product #%(product_id)d, quantity %(quantity)d"
+        ) % {
+            "basket_id": self.basket.pk,
+            "product_id": self.product.pk,
+            "quantity": self.quantity,
+        }
 
     def save(self, *args, **kwargs):
         if not self.basket.can_be_edited:
             raise PermissionDenied(
-                _("You cannot modify a %s basket") % (
-                    self.basket.status.lower(),))
+                _("You cannot modify a %s basket") % (self.basket.status.lower(),)
+            )
         return super().save(*args, **kwargs)
 
     # =============
@@ -718,12 +756,11 @@ class AbstractLine(models.Model):
         """
         Remove any discounts from this line.
         """
-        self._discount_excl_tax = D('0.00')
-        self._discount_incl_tax = D('0.00')
+        self._discount_excl_tax = D("0.00")
+        self._discount_incl_tax = D("0.00")
         self.consumer = LineOfferConsumer(self)
 
-    def discount(self, discount_value, affected_quantity, incl_tax=True,
-                 offer=None):
+    def discount(self, discount_value, affected_quantity, incl_tax=True, offer=None):
         """
         Apply a discount to this line
         """
@@ -731,13 +768,15 @@ class AbstractLine(models.Model):
             if self._discount_excl_tax > 0:
                 raise RuntimeError(
                     "Attempting to discount the tax-inclusive price of a line "
-                    "when tax-exclusive discounts are already applied")
+                    "when tax-exclusive discounts are already applied"
+                )
             self._discount_incl_tax += discount_value
         else:
             if self._discount_incl_tax > 0:
                 raise RuntimeError(
                     "Attempting to discount the tax-exclusive price of a line "
-                    "when tax-inclusive discounts are already applied")
+                    "when tax-inclusive discounts are already applied"
+                )
             self._discount_excl_tax += discount_value
         self.consume(affected_quantity, offer=offer)
 
@@ -757,26 +796,35 @@ class AbstractLine(models.Model):
         tuples.
         """
         if not self.is_tax_known:
-            raise RuntimeError("A price breakdown can only be determined "
-                               "when taxes are known")
+            raise RuntimeError(
+                "A price breakdown can only be determined when taxes are known"
+            )
         prices = []
         if not self.discount_value:
-            prices.append((self.unit_price_incl_tax, self.unit_price_excl_tax,
-                           self.quantity))
+            prices.append(
+                (self.unit_price_incl_tax, self.unit_price_excl_tax, self.quantity)
+            )
         else:
             # Need to split the discount among the affected quantity
             # of products.
-            item_incl_tax_discount = (
-                self.discount_value / int(self.consumer.consumed()))
+            item_incl_tax_discount = self.discount_value / int(self.consumer.consumed())
             item_excl_tax_discount = item_incl_tax_discount * self._tax_ratio
             item_excl_tax_discount = round_half_up(item_excl_tax_discount)
-            prices.append((self.unit_price_incl_tax - item_incl_tax_discount,
-                           self.unit_price_excl_tax - item_excl_tax_discount,
-                           self.consumer.consumed()))
+            prices.append(
+                (
+                    self.unit_price_incl_tax - item_incl_tax_discount,
+                    self.unit_price_excl_tax - item_excl_tax_discount,
+                    self.consumer.consumed(),
+                )
+            )
             if self.quantity_without_discount:
-                prices.append((self.unit_price_incl_tax,
-                               self.unit_price_excl_tax,
-                               self.quantity_without_discount))
+                prices.append(
+                    (
+                        self.unit_price_incl_tax,
+                        self.unit_price_excl_tax,
+                        self.quantity_without_discount,
+                    )
+                )
         return prices
 
     # =======
@@ -806,7 +854,9 @@ class AbstractLine(models.Model):
         return self.consumer.available(offer) > 0
 
     def quantity_available_for_offer(self, offer):
-        return self.quantity_without_offer_discount(offer) + self.quantity_with_offer_discount(offer)
+        return self.quantity_without_offer_discount(
+            offer
+        ) + self.quantity_with_offer_discount(offer)
 
     # ==========
     # Properties
@@ -829,15 +879,15 @@ class AbstractLine(models.Model):
         # Only one of the incl- and excl- discounts should be non-zero
         return max(self._discount_incl_tax, self._discount_excl_tax)
 
+    # pylint: disable=W0201
     @property
     def purchase_info(self):
         """
         Return the stock/price info
         """
-        if not hasattr(self, '_info'):
+        if not hasattr(self, "_info"):
             # Cache the PurchaseInfo instance.
-            self._info = self.basket.strategy.fetch_for_line(
-                self, self.stockrecord)
+            self._info = self.basket.strategy.fetch_for_line(self, self.stockrecord)
         return self._info
 
     @property
@@ -877,9 +927,11 @@ class AbstractLine(models.Model):
             # against tax inclusive prices but we need to guess how much of the
             # discount applies to tax-exclusive prices.  We do this by
             # assuming a linear tax and scaling down the original discount.
-            return max(0, self.line_price_excl_tax - round_half_up(
-                self._tax_ratio * self._discount_incl_tax
-            ))
+            return max(
+                0,
+                self.line_price_excl_tax
+                - round_half_up(self._tax_ratio * self._discount_incl_tax),
+            )
         return self.line_price_excl_tax
 
     @property
@@ -890,14 +942,23 @@ class AbstractLine(models.Model):
         if self.line_price_incl_tax is not None and self._discount_incl_tax:
             return max(0, self.line_price_incl_tax - self._discount_incl_tax)
         elif self.line_price_excl_tax is not None and self._discount_excl_tax:
-            return max(0, round_half_up((self.line_price_excl_tax - self._discount_excl_tax) / self._tax_ratio))
+            return max(
+                0,
+                round_half_up(
+                    (self.line_price_excl_tax - self._discount_excl_tax)
+                    / self._tax_ratio
+                ),
+            )
 
         return self.line_price_incl_tax
 
     @property
     def line_tax(self):
         if self.is_tax_known:
-            return self.line_price_incl_tax_incl_discounts - self.line_price_excl_tax_incl_discounts
+            return (
+                self.line_price_incl_tax_incl_discounts
+                - self.line_price_excl_tax_incl_discounts
+            )
 
     @property
     def line_price_incl_tax(self):
@@ -911,7 +972,10 @@ class AbstractLine(models.Model):
         for attribute in self.attributes.all():
             value = attribute.value
             if isinstance(value, list):
-                ops.append("%s = '%s'" % (attribute.option.name, (", ".join([str(v) for v in value]))))
+                ops.append(
+                    "%s = '%s'"
+                    % (attribute.option.name, (", ".join([str(v) for v in value])))
+                )
             else:
                 ops.append("%s = '%s'" % (attribute.option.name, value))
         if ops:
@@ -926,7 +990,7 @@ class AbstractLine(models.Model):
         """
         if isinstance(self.purchase_info.availability, Unavailable):
             msg = "'%(product)s' is no longer available"
-            return _(msg) % {'product': self.product.get_title()}
+            return _(msg) % {"product": self.product.get_title()}
 
         if not self.price_incl_tax:
             return
@@ -937,19 +1001,23 @@ class AbstractLine(models.Model):
         current_price_incl_tax = self.purchase_info.price.incl_tax
         if current_price_incl_tax != self.price_incl_tax:
             product_prices = {
-                'product': self.product.get_title(),
-                'old_price': currency(self.price_incl_tax, self.price_currency),
-                'new_price': currency(current_price_incl_tax, self.price_currency)
+                "product": self.product.get_title(),
+                "old_price": currency(self.price_incl_tax, self.price_currency),
+                "new_price": currency(current_price_incl_tax, self.price_currency),
             }
             if current_price_incl_tax > self.price_incl_tax:
-                warning = _("The price of '%(product)s' has increased from"
-                            " %(old_price)s to %(new_price)s since you added"
-                            " it to your basket")
+                warning = _(
+                    "The price of '%(product)s' has increased from"
+                    " %(old_price)s to %(new_price)s since you added"
+                    " it to your basket"
+                )
                 return warning % product_prices
             else:
-                warning = _("The price of '%(product)s' has decreased from"
-                            " %(old_price)s to %(new_price)s since you added"
-                            " it to your basket")
+                warning = _(
+                    "The price of '%(product)s' has decreased from"
+                    " %(old_price)s to %(new_price)s since you added"
+                    " it to your basket"
+                )
                 return warning % product_prices
 
 
@@ -957,19 +1025,20 @@ class AbstractLineAttribute(models.Model):
     """
     An attribute of a basket line
     """
+
     line = models.ForeignKey(
-        'basket.Line',
+        "basket.Line",
         on_delete=models.CASCADE,
-        related_name='attributes',
-        verbose_name=_("Line"))
+        related_name="attributes",
+        verbose_name=_("Line"),
+    )
     option = models.ForeignKey(
-        'catalogue.Option',
-        on_delete=models.CASCADE,
-        verbose_name=_("Option"))
+        "catalogue.Option", on_delete=models.CASCADE, verbose_name=_("Option")
+    )
     value = models.JSONField(_("Value"), encoder=DjangoJSONEncoder)
 
     class Meta:
         abstract = True
-        app_label = 'basket'
-        verbose_name = _('Line attribute')
-        verbose_name_plural = _('Line attributes')
+        app_label = "basket"
+        verbose_name = _("Line attribute")
+        verbose_name_plural = _("Line attributes")

src/oscar/apps/basket/admin.py

@@ -2,31 +2,59 @@ from django.contrib import admin
 
 from oscar.core.loading import get_model
 
-Line = get_model('basket', 'line')
+Line = get_model("basket", "line")
 
 
 class LineInline(admin.TabularInline):
     model = Line
-    readonly_fields = ('line_reference', 'product', 'price_excl_tax',
-                       'price_incl_tax', 'price_currency', 'stockrecord')
+    readonly_fields = (
+        "line_reference",
+        "product",
+        "price_excl_tax",
+        "price_incl_tax",
+        "price_currency",
+        "stockrecord",
+    )
 
 
 class LineAdmin(admin.ModelAdmin):
-    list_display = ('id', 'basket', 'product', 'stockrecord', 'quantity',
-                    'price_excl_tax', 'price_currency', 'date_created')
-    readonly_fields = ('basket', 'stockrecord', 'line_reference', 'product',
-                       'price_currency', 'price_incl_tax', 'price_excl_tax',
-                       'quantity')
+    list_display = (
+        "id",
+        "basket",
+        "product",
+        "stockrecord",
+        "quantity",
+        "price_excl_tax",
+        "price_currency",
+        "date_created",
+    )
+    readonly_fields = (
+        "basket",
+        "stockrecord",
+        "line_reference",
+        "product",
+        "price_currency",
+        "price_incl_tax",
+        "price_excl_tax",
+        "quantity",
+    )
 
 
 class BasketAdmin(admin.ModelAdmin):
-    list_display = ('id', 'owner', 'status', 'num_lines',
-                    'contains_a_voucher', 'date_created', 'date_submitted',
-                    'time_before_submit')
-    readonly_fields = ('owner', 'date_merged', 'date_submitted')
+    list_display = (
+        "id",
+        "owner",
+        "status",
+        "num_lines",
+        "contains_a_voucher",
+        "date_created",
+        "date_submitted",
+        "time_before_submit",
+    )
+    readonly_fields = ("owner", "date_merged", "date_submitted")
     inlines = [LineInline]
 
 
-admin.site.register(get_model('basket', 'basket'), BasketAdmin)
+admin.site.register(get_model("basket", "basket"), BasketAdmin)
 admin.site.register(Line, LineAdmin)
-admin.site.register(get_model('basket', 'LineAttribute'))
+admin.site.register(get_model("basket", "LineAttribute"))

src/oscar/apps/basket/apps.py

@@ -1,3 +1,4 @@
+# pylint: disable=W0201
 from django.contrib.auth.decorators import login_required
 from django.urls import path
 from django.utils.translation import gettext_lazy as _
@@ -7,25 +8,30 @@ from oscar.core.loading import get_class
 
 
 class BasketConfig(OscarConfig):
-    label = 'basket'
-    name = 'oscar.apps.basket'
-    verbose_name = _('Basket')
+    label = "basket"
+    name = "oscar.apps.basket"
+    verbose_name = _("Basket")
 
-    namespace = 'basket'
+    namespace = "basket"
 
+    # pylint: disable=attribute-defined-outside-init
     def ready(self):
-        self.summary_view = get_class('basket.views', 'BasketView')
-        self.saved_view = get_class('basket.views', 'SavedView')
-        self.add_view = get_class('basket.views', 'BasketAddView')
-        self.add_voucher_view = get_class('basket.views', 'VoucherAddView')
-        self.remove_voucher_view = get_class('basket.views', 'VoucherRemoveView')
+        self.summary_view = get_class("basket.views", "BasketView")
+        self.saved_view = get_class("basket.views", "SavedView")
+        self.add_view = get_class("basket.views", "BasketAddView")
+        self.add_voucher_view = get_class("basket.views", "VoucherAddView")
+        self.remove_voucher_view = get_class("basket.views", "VoucherRemoveView")
 
     def get_urls(self):
         urls = [
-            path('', self.summary_view.as_view(), name='summary'),
-            path('add/<int:pk>/', self.add_view.as_view(), name='add'),
-            path('vouchers/add/', self.add_voucher_view.as_view(), name='vouchers-add'),
-            path('vouchers/<int:pk>/remove/', self.remove_voucher_view.as_view(), name='vouchers-remove'),
-            path('saved/', login_required(self.saved_view.as_view()), name='saved'),
+            path("", self.summary_view.as_view(), name="summary"),
+            path("add/<int:pk>/", self.add_view.as_view(), name="add"),
+            path("vouchers/add/", self.add_voucher_view.as_view(), name="vouchers-add"),
+            path(
+                "vouchers/<int:pk>/remove/",
+                self.remove_voucher_view.as_view(),
+                name="vouchers-remove",
+            ),
+            path("saved/", login_required(self.saved_view.as_view()), name="saved"),
         ]
         return self.post_process_urls(urls)

src/oscar/apps/basket/forms.py

@@ -1,3 +1,4 @@
+# pylint: disable=unused-argument
 from django import forms
 from django.conf import settings
 from django.core.validators import EMPTY_VALUES
@@ -8,26 +9,34 @@ from django.utils.translation import gettext_lazy as _
 from oscar.core.loading import get_model
 from oscar.forms import widgets
 
-Line = get_model('basket', 'line')
-Basket = get_model('basket', 'basket')
-Option = get_model('catalogue', 'option')
-Product = get_model('catalogue', 'product')
+Line = get_model("basket", "line")
+Basket = get_model("basket", "basket")
+Option = get_model("catalogue", "option")
+Product = get_model("catalogue", "product")
 
 
 def _option_text_field(form, product, option):
-    return forms.CharField(label=option.name, required=option.required, help_text=option.help_text)
+    return forms.CharField(
+        label=option.name, required=option.required, help_text=option.help_text
+    )
 
 
 def _option_integer_field(form, product, option):
-    return forms.IntegerField(label=option.name, required=option.required, help_text=option.help_text)
+    return forms.IntegerField(
+        label=option.name, required=option.required, help_text=option.help_text
+    )
 
 
 def _option_boolean_field(form, product, option):
-    return forms.BooleanField(label=option.name, required=option.required, help_text=option.help_text)
+    return forms.BooleanField(
+        label=option.name, required=option.required, help_text=option.help_text
+    )
 
 
 def _option_float_field(form, product, option):
-    return forms.FloatField(label=option.name, required=option.required, help_text=option.help_text)
+    return forms.FloatField(
+        label=option.name, required=option.required, help_text=option.help_text
+    )
 
 
 def _option_date_field(form, product, option):
@@ -35,7 +44,7 @@ def _option_date_field(form, product, option):
         label=option.name,
         required=option.required,
         widget=forms.widgets.SelectDateWidget,
-        help_text=option.help_text
+        help_text=option.help_text,
     )
 
 
@@ -44,7 +53,7 @@ def _option_select_field(form, product, option):
         label=option.name,
         required=option.required,
         choices=option.get_choices(),
-        help_text=option.help_text
+        help_text=option.help_text,
     )
 
 
@@ -54,7 +63,7 @@ def _option_radio_field(form, product, option):
         required=option.required,
         choices=option.get_choices(),
         widget=forms.RadioSelect,
-        help_text=option.help_text
+        help_text=option.help_text,
     )
 
 
@@ -63,7 +72,7 @@ def _option_multi_select_field(form, product, option):
         label=option.name,
         required=option.required,
         choices=option.get_choices(),
-        help_text=option.help_text
+        help_text=option.help_text,
     )
 
 
@@ -73,14 +82,17 @@ def _option_checkbox_field(form, product, option):
         required=option.required,
         choices=option.get_choices(),
         widget=forms.CheckboxSelectMultiple,
-        help_text=option.help_text
+        help_text=option.help_text,
     )
 
 
 class BasketLineForm(forms.ModelForm):
-    quantity = forms.IntegerField(label=_('Quantity'), min_value=0, required=False, initial=1)
+    quantity = forms.IntegerField(
+        label=_("Quantity"), min_value=0, required=False, initial=1
+    )
     save_for_later = forms.BooleanField(
-        initial=False, required=False, label=_('Save for Later'))
+        initial=False, required=False, label=_("Save for Later")
+    )
 
     def __init__(self, strategy, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -91,15 +103,18 @@ class BasketLineForm(forms.ModelForm):
         # https://github.com/django-oscar/django-oscar/issues/2873.
         if self.instance.id:
             max_allowed_quantity = None
-            num_available = getattr(self.instance.purchase_info.availability, 'num_available', None)
+            num_available = getattr(
+                self.instance.purchase_info.availability, "num_available", None
+            )
             basket_max_allowed_quantity = self.instance.basket.max_allowed_quantity()[0]
             if all([num_available, basket_max_allowed_quantity]):
                 max_allowed_quantity = min(num_available, basket_max_allowed_quantity)
             else:
                 max_allowed_quantity = num_available or basket_max_allowed_quantity
             if max_allowed_quantity:
-                self.fields['quantity'].widget.attrs['max'] = max_allowed_quantity
+                self.fields["quantity"].widget.attrs["max"] = max_allowed_quantity
 
+    # pylint: disable=W0201
     def full_clean(self):
         if not self.instance.id:
             self.cleaned_data = {}
@@ -113,7 +128,7 @@ class BasketLineForm(forms.ModelForm):
         return super().has_changed()
 
     def clean_quantity(self):
-        qty = self.cleaned_data['quantity'] or 0
+        qty = self.cleaned_data["quantity"] or 0
         if qty > 0:
             self.check_max_allowed_quantity(qty)
             self.check_permission(qty)
@@ -126,29 +141,31 @@ class BasketLineForm(forms.ModelForm):
         # number and updated. Thus, product already in the basket and we don't
         # add second time, just updating number of items.
         qty_delta = qty - self.instance.quantity
-        is_allowed, reason = self.instance.basket.is_quantity_allowed(qty_delta, line=self.instance)
+        is_allowed, reason = self.instance.basket.is_quantity_allowed(
+            qty_delta, line=self.instance
+        )
         if not is_allowed:
             raise forms.ValidationError(reason)
 
     def check_permission(self, qty):
         policy = self.instance.purchase_info.availability
-        is_available, reason = policy.is_purchase_permitted(
-            quantity=qty)
+        is_available, reason = policy.is_purchase_permitted(quantity=qty)
         if not is_available:
             raise forms.ValidationError(reason)
 
     class Meta:
         model = Line
-        fields = ['quantity']
+        fields = ["quantity"]
 
 
 class SavedLineForm(forms.ModelForm):
-    move_to_basket = forms.BooleanField(initial=False, required=False,
-                                        label=_('Move to Basket'))
+    move_to_basket = forms.BooleanField(
+        initial=False, required=False, label=_("Move to Basket")
+    )
 
     class Meta:
         model = Line
-        fields = ('id', 'move_to_basket')
+        fields = ("id", "move_to_basket")
 
     def __init__(self, strategy, basket, *args, **kwargs):
         self.strategy = strategy
@@ -157,36 +174,36 @@ class SavedLineForm(forms.ModelForm):
 
     def clean(self):
         cleaned_data = super().clean()
-        if not cleaned_data['move_to_basket']:
+        if not cleaned_data["move_to_basket"]:
             # skip further validation (see issue #666)
             return cleaned_data
 
         # Get total quantity of all lines with this product (there's normally
         # only one but there can be more if you allow product options).
         lines = self.basket.lines.filter(product=self.instance.product)
-        current_qty = lines.aggregate(Sum('quantity'))['quantity__sum'] or 0
+        current_qty = lines.aggregate(Sum("quantity"))["quantity__sum"] or 0
         desired_qty = current_qty + self.instance.quantity
 
         result = self.strategy.fetch_for_product(self.instance.product)
         is_available, reason = result.availability.is_purchase_permitted(
-            quantity=desired_qty)
+            quantity=desired_qty
+        )
         if not is_available:
             raise forms.ValidationError(reason)
         return cleaned_data
 
 
 class BasketVoucherForm(forms.Form):
-    code = forms.CharField(max_length=128, label=_('Code'))
+    code = forms.CharField(max_length=128, label=_("Code"))
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def clean_code(self):
-        return self.cleaned_data['code'].strip().upper()
+        return self.cleaned_data["code"].strip().upper()
 
 
 class AddToBasketForm(forms.Form):
-
     OPTION_FIELD_FACTORIES = {
         Option.TEXT: _option_text_field,
         Option.INTEGER: _option_integer_field,
@@ -199,7 +216,7 @@ class AddToBasketForm(forms.Form):
         Option.CHECKBOX: _option_checkbox_field,
     }
 
-    quantity = forms.IntegerField(initial=1, min_value=1, label=_('Quantity'))
+    quantity = forms.IntegerField(initial=1, min_value=1, label=_("Quantity"))
 
     def __init__(self, basket, product, *args, **kwargs):
         # Note, the product passed in here isn't necessarily the product being
@@ -243,9 +260,11 @@ class AddToBasketForm(forms.Form):
 
             choices.append((child.id, summary))
 
-        self.fields['child_id'] = forms.ChoiceField(
-            choices=tuple(choices), label=_("Variant"),
-            widget=widgets.AdvancedSelect(disabled_values=disabled_values))
+        self.fields["child_id"] = forms.ChoiceField(
+            choices=tuple(choices),
+            label=_("Variant"),
+            widget=widgets.AdvancedSelect(disabled_values=disabled_values),
+        )
 
     def _create_product_fields(self, product):
         """
@@ -261,39 +280,41 @@ class AddToBasketForm(forms.Form):
         This is designed to be overridden so that specific widgets can be used
         for certain types of options.
         """
-        option_field = self.OPTION_FIELD_FACTORIES.get(option.type, _option_text_field)(self, product, option)
+        option_field = self.OPTION_FIELD_FACTORIES.get(option.type, _option_text_field)(
+            self, product, option
+        )
         self.fields[option.code] = option_field
 
     # Cleaning
 
     def clean_child_id(self):
         try:
-            child = self.parent_product.children.get(
-                id=self.cleaned_data['child_id'])
+            child = self.parent_product.children.get(id=self.cleaned_data["child_id"])
         except Product.DoesNotExist:
-            raise forms.ValidationError(
-                _("Please select a valid product"))
+            raise forms.ValidationError(_("Please select a valid product"))
 
         # To avoid duplicate SQL queries, we cache a copy of the loaded child
         # product as we're going to need it later.
-        self.child_product = child
+        self.child_product = child  # pylint: disable=W0201
 
-        return self.cleaned_data['child_id']
+        return self.cleaned_data["child_id"]
 
     def clean_quantity(self):
         # Check that the proposed new line quantity is sensible
-        qty = self.cleaned_data['quantity']
+        qty = self.cleaned_data["quantity"]
         basket_threshold = settings.OSCAR_MAX_BASKET_QUANTITY_THRESHOLD
         if basket_threshold:
             total_basket_quantity = self.basket.num_items
             max_allowed = basket_threshold - total_basket_quantity
             if qty > max_allowed:
                 raise forms.ValidationError(
-                    _("Due to technical limitations we are not able to ship"
-                      " more than %(threshold)d items in one order. Your"
-                      " basket currently has %(basket)d items.")
-                    % {'threshold': basket_threshold,
-                       'basket': total_basket_quantity})
+                    _(
+                        "Due to technical limitations we are not able to ship"
+                        " more than %(threshold)d items in one order. Your"
+                        " basket currently has %(basket)d items."
+                    )
+                    % {"threshold": basket_threshold, "basket": total_basket_quantity}
+                )
         return qty
 
     @property
@@ -303,7 +324,7 @@ class AddToBasketForm(forms.Form):
         """
         # Note, the child product attribute is saved in the clean_child_id
         # method
-        return getattr(self, 'child_product', self.parent_product)
+        return getattr(self, "child_product", self.parent_product)
 
     def clean(self):
         info = self.basket.strategy.fetch_for_product(self.product)
@@ -311,22 +332,26 @@ class AddToBasketForm(forms.Form):
         # Check that a price was found by the strategy
         if not info.price.exists:
             raise forms.ValidationError(
-                _("This product cannot be added to the basket because a "
-                  "price could not be determined for it."))
+                _(
+                    "This product cannot be added to the basket because a "
+                    "price could not be determined for it."
+                )
+            )
 
         # Check currencies are sensible
-        if (self.basket.currency
-                and info.price.currency != self.basket.currency):
+        if self.basket.currency and info.price.currency != self.basket.currency:
             raise forms.ValidationError(
-                _("This product cannot be added to the basket as its currency "
-                  "isn't the same as other products in your basket"))
+                _(
+                    "This product cannot be added to the basket as its currency "
+                    "isn't the same as other products in your basket"
+                )
+            )
 
         # Check user has permission to add the desired quantity to their
         # basket.
         current_qty = self.basket.product_quantity(self.product)
-        desired_qty = current_qty + self.cleaned_data.get('quantity', 1)
-        is_permitted, reason = info.availability.is_purchase_permitted(
-            desired_qty)
+        desired_qty = current_qty + self.cleaned_data.get("quantity", 1)
+        is_permitted, reason = info.availability.is_purchase_permitted(desired_qty)
         if not is_permitted:
             raise forms.ValidationError(reason)
 
@@ -343,18 +368,16 @@ class AddToBasketForm(forms.Form):
             if option.code in self.cleaned_data:
                 value = self.cleaned_data[option.code]
                 if option.required or value not in EMPTY_VALUES:
-                    options.append(
-                        {"option": option, "value": value}
-                    )
+                    options.append({"option": option, "value": value})
         return options
 
 
 class SimpleAddToBasketMixin:
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if 'quantity' in self.fields:
-            self.fields['quantity'].initial = 1
-            self.fields['quantity'].widget = forms.HiddenInput()
+        if "quantity" in self.fields:
+            self.fields["quantity"].initial = 1
+            self.fields["quantity"].widget = forms.HiddenInput()
 
 
 class SimpleAddToBasketForm(SimpleAddToBasketMixin, AddToBasketForm):

src/oscar/apps/basket/formsets.py

@@ -3,19 +3,19 @@ from django.utils.functional import cached_property
 
 from oscar.core.loading import get_classes, get_model
 
-Line = get_model('basket', 'line')
-BasketLineForm, SavedLineForm = get_classes('basket.forms', ['BasketLineForm', 'SavedLineForm'])
+Line = get_model("basket", "line")
+BasketLineForm, SavedLineForm = get_classes(
+    "basket.forms", ["BasketLineForm", "SavedLineForm"]
+)
 
 
 class BaseBasketLineFormSet(BaseModelFormSet):
-
     def __init__(self, strategy, *args, **kwargs):
         self.strategy = strategy
         super().__init__(*args, **kwargs)
 
     def _construct_form(self, i, **kwargs):
-        return super()._construct_form(
-            i, strategy=self.strategy, **kwargs)
+        return super()._construct_form(i, strategy=self.strategy, **kwargs)
 
     def _should_delete_form(self, form):
         """
@@ -29,8 +29,8 @@ class BaseBasketLineFormSet(BaseModelFormSet):
         # as well.
         if not form.instance.id:
             return True
-        if self.can_delete and 'quantity' in form.cleaned_data:
-            return form.cleaned_data['quantity'] == 0
+        if self.can_delete and "quantity" in form.cleaned_data:  # pylint: disable=E1101
+            return form.cleaned_data["quantity"] == 0
 
     @cached_property
     def forms_with_instances(self):
@@ -44,12 +44,11 @@ class BaseBasketLineFormSet(BaseModelFormSet):
 
 
 BasketLineFormSet = modelformset_factory(
-    Line, form=BasketLineForm, formset=BaseBasketLineFormSet, extra=0,
-    can_delete=True)
+    Line, form=BasketLineForm, formset=BaseBasketLineFormSet, extra=0, can_delete=True
+)
 
 
 class BaseSavedLineFormSet(BaseModelFormSet):
-
     def __init__(self, strategy, basket, *args, **kwargs):
         self.strategy = strategy
         self.basket = basket
@@ -57,9 +56,10 @@ class BaseSavedLineFormSet(BaseModelFormSet):
 
     def _construct_form(self, i, **kwargs):
         return super()._construct_form(
-            i, strategy=self.strategy, basket=self.basket, **kwargs)
+            i, strategy=self.strategy, basket=self.basket, **kwargs
+        )
 
 
-SavedLineFormSet = modelformset_factory(Line, form=SavedLineForm,
-                                        formset=BaseSavedLineFormSet, extra=0,
-                                        can_delete=True)
+SavedLineFormSet = modelformset_factory(
+    Line, form=SavedLineForm, formset=BaseSavedLineFormSet, extra=0, can_delete=True
+)

src/oscar/apps/basket/managers.py

@@ -3,28 +3,26 @@ from django.db import models
 
 class OpenBasketManager(models.Manager):
     """For searching/creating OPEN baskets only."""
+
     status_filter = "Open"
 
     def get_queryset(self):
-        return super().get_queryset().filter(
-            status=self.status_filter)
+        return super().get_queryset().filter(status=self.status_filter)
 
     def get_or_create(self, **kwargs):
-        return self.get_queryset().get_or_create(
-            status=self.status_filter, **kwargs)
+        return self.get_queryset().get_or_create(status=self.status_filter, **kwargs)
 
 
 class SavedBasketManager(models.Manager):
     """For searching/creating SAVED baskets only."""
+
     status_filter = "Saved"
 
     def get_queryset(self):
-        return super().get_queryset().filter(
-            status=self.status_filter)
+        return super().get_queryset().filter(status=self.status_filter)
 
     def create(self, **kwargs):
         return self.get_queryset().create(status=self.status_filter, **kwargs)
 
     def get_or_create(self, **kwargs):
-        return self.get_queryset().get_or_create(
-            status=self.status_filter, **kwargs)
+        return self.get_queryset().get_or_create(status=self.status_filter, **kwargs)

src/oscar/apps/basket/middleware.py

@@ -6,15 +6,14 @@ from django.utils.translation import gettext_lazy as _
 
 from oscar.core.loading import get_class, get_model
 
-Applicator = get_class('offer.applicator', 'Applicator')
-Basket = get_model('basket', 'basket')
-Selector = get_class('partner.strategy', 'Selector')
+Applicator = get_class("offer.applicator", "Applicator")
+Basket = get_model("basket", "basket")
+Selector = get_class("partner.strategy", "Selector")
 
 selector = Selector()
 
 
 class BasketMiddleware:
-
     def __init__(self, get_response):
         self.get_response = get_response
 
@@ -63,34 +62,42 @@ class BasketMiddleware:
 
     def process_response(self, request, response):
         # Delete any surplus cookies
-        cookies_to_delete = getattr(request, 'cookies_to_delete', [])
+        cookies_to_delete = getattr(request, "cookies_to_delete", [])
         for cookie_key in cookies_to_delete:
             response.delete_cookie(cookie_key)
 
-        if not hasattr(request, 'basket'):
+        if not hasattr(request, "basket"):
             return response
 
         # If the basket was never initialized we can safely return
-        if (isinstance(request.basket, SimpleLazyObject)
-                and request.basket._wrapped is empty):
+        if (
+            isinstance(request.basket, SimpleLazyObject)
+            and request.basket._wrapped is empty
+        ):
             return response
 
         cookie_key = self.get_cookie_key(request)
         # Check if we need to set a cookie. If the cookies is already available
         # but is set in the cookies_to_delete list then we need to re-set it.
         has_basket_cookie = (
-            cookie_key in request.COOKIES
-            and cookie_key not in cookies_to_delete)
+            cookie_key in request.COOKIES and cookie_key not in cookies_to_delete
+        )
 
         # If a basket has had products added to it, but the user is anonymous
         # then we need to assign it to a cookie
-        if (request.basket.id and not request.user.is_authenticated
-                and not has_basket_cookie):
+        if (
+            request.basket.id
+            and not request.user.is_authenticated
+            and not has_basket_cookie
+        ):
             cookie = self.get_basket_hash(request.basket.id)
             response.set_cookie(
-                cookie_key, cookie,
+                cookie_key,
+                cookie,
                 max_age=settings.OSCAR_BASKET_COOKIE_LIFETIME,
-                secure=settings.OSCAR_BASKET_COOKIE_SECURE, httponly=True)
+                secure=settings.OSCAR_BASKET_COOKIE_SECURE,
+                httponly=True,
+            )
         return response
 
     def get_cookie_key(self, request):
@@ -103,11 +110,11 @@ class BasketMiddleware:
         return settings.OSCAR_BASKET_COOKIE_OPEN
 
     def process_template_response(self, request, response):
-        if hasattr(response, 'context_data'):
+        if hasattr(response, "context_data"):
             if response.context_data is None:
                 response.context_data = {}
-            if 'basket' not in response.context_data:
-                response.context_data['basket'] = request.basket
+            if "basket" not in response.context_data:
+                response.context_data["basket"] = request.basket
             else:
                 # Occasionally, a view will want to pass an alternative basket
                 # to be rendered.  This can happen as part of checkout
@@ -117,7 +124,7 @@ class BasketMiddleware:
                 # template, we need to ensure that the frozen basket gets
                 # rendered (not request.basket).  We still keep a reference to
                 # the request basket (just in case).
-                response.context_data['request_basket'] = request.basket
+                response.context_data["request_basket"] = request.basket
         return response
 
     # Helper methods
@@ -134,7 +141,7 @@ class BasketMiddleware:
         cookie_key = self.get_cookie_key(request)
         cookie_basket = self.get_cookie_basket(cookie_key, request, manager)
 
-        if hasattr(request, 'user') and request.user.is_authenticated:
+        if hasattr(request, "user") and request.user.is_authenticated:
             # Signed-in user: if they have a cookie basket too, it means
             # that they have just signed in and we need to merge their cookie
             # basket into their user basket, then delete the cookie.
@@ -170,9 +177,14 @@ class BasketMiddleware:
         request._basket_cache = basket
 
         if num_baskets_merged > 0:
-            messages.add_message(request, messages.WARNING,
-                                 _("We have merged a basket from a previous session. Its contents "
-                                   "might have changed."))
+            messages.add_message(
+                request,
+                messages.WARNING,
+                _(
+                    "We have merged a basket from a previous session. Its contents "
+                    "might have changed."
+                ),
+            )
 
         return basket
 
@@ -184,6 +196,7 @@ class BasketMiddleware:
         """
         master.merge(slave, add_quantities=False)
 
+    # pylint: disable=unused-argument
     def get_cookie_basket(self, cookie_key, request, manager):
         """
         Looks for a basket which is referenced by a cookie.
@@ -196,8 +209,9 @@ class BasketMiddleware:
             basket_hash = request.COOKIES[cookie_key]
             try:
                 basket_id = Signer().unsign(basket_hash)
-                basket = Basket.objects.get(pk=basket_id, owner=None,
-                                            status=Basket.OPEN)
+                basket = Basket.objects.get(
+                    pk=basket_id, owner=None, status=Basket.OPEN
+                )
             except (BadSignature, Basket.DoesNotExist):
                 request.cookies_to_delete.append(cookie_key)
         return basket

src/oscar/apps/basket/models.py

@@ -1,9 +1,12 @@
 from oscar.apps.basket.abstract_models import (
-    AbstractBasket, AbstractLine, AbstractLineAttribute)
+    AbstractBasket,
+    AbstractLine,
+    AbstractLineAttribute,
+)
 from oscar.core.loading import is_model_registered
 
 __all__ = [
-    'InvalidBasketLineError',
+    "InvalidBasketLineError",
 ]
 
 
@@ -11,22 +14,25 @@ class InvalidBasketLineError(Exception):
     pass
 
 
-if not is_model_registered('basket', 'Basket'):
+if not is_model_registered("basket", "Basket"):
+
     class Basket(AbstractBasket):
         pass
 
-    __all__.append('Basket')
+    __all__.append("Basket")
+
 
+if not is_model_registered("basket", "Line"):
 
-if not is_model_registered('basket', 'Line'):
     class Line(AbstractLine):
         pass
 
-    __all__.append('Line')
+    __all__.append("Line")
+
 
+if not is_model_registered("basket", "LineAttribute"):
 
-if not is_model_registered('basket', 'LineAttribute'):
     class LineAttribute(AbstractLineAttribute):
         pass
 
-    __all__.append('LineAttribute')
+    __all__.append("LineAttribute")

src/oscar/apps/basket/reports.py

@@ -2,122 +2,133 @@ 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')
-ReportHTMLFormatter = get_class('dashboard.reports.reports',
-                                'ReportHTMLFormatter')
-Basket = get_model('basket', 'Basket')
+ReportGenerator = get_class("dashboard.reports.reports", "ReportGenerator")
+ReportCSVFormatter = get_class("dashboard.reports.reports", "ReportCSVFormatter")
+ReportHTMLFormatter = get_class("dashboard.reports.reports", "ReportHTMLFormatter")
+Basket = get_model("basket", "Basket")
 
 
 class OpenBasketReportCSVFormatter(ReportCSVFormatter):
-    filename_template = 'open-baskets-%s-%s.csv'
+    filename_template = "open-baskets-%s-%s.csv"
 
     def generate_csv(self, response, baskets):
         writer = self.get_csv_writer(response)
-        header_row = [_('User ID'),
-                      _('Name'),
-                      _('Email'),
-                      _('Basket status'),
-                      _('Num lines'),
-                      _('Num items'),
-                      _('Date of creation'),
-                      _('Time since creation'),
-                      ]
+        header_row = [
+            _("User ID"),
+            _("Name"),
+            _("Email"),
+            _("Basket status"),
+            _("Num lines"),
+            _("Num items"),
+            _("Date of creation"),
+            _("Time since creation"),
+        ]
         writer.writerow(header_row)
 
         for basket in baskets:
             if basket.owner:
-                row = [basket.owner_id, basket.owner.get_full_name(),
-                       basket.owner.email,
-                       basket.status, basket.num_lines, basket.num_items,
-                       self.format_datetime(basket.date_created),
-                       basket.time_since_creation]
+                row = [
+                    basket.owner_id,
+                    basket.owner.get_full_name(),
+                    basket.owner.email,
+                    basket.status,
+                    basket.num_lines,
+                    basket.num_items,
+                    self.format_datetime(basket.date_created),
+                    basket.time_since_creation,
+                ]
             else:
-                row = [basket.owner_id, None, None, basket.status,
-                       basket.num_lines, basket.num_items,
-                       self.format_datetime(basket.date_created),
-                       self.format_timedelta(basket.time_since_creation)]
+                row = [
+                    basket.owner_id,
+                    None,
+                    None,
+                    basket.status,
+                    basket.num_lines,
+                    basket.num_items,
+                    self.format_datetime(basket.date_created),
+                    self.format_timedelta(basket.time_since_creation),
+                ]
             writer.writerow(row)
 
     def filename(self, **kwargs):
-        return self.filename_template % (kwargs['start_date'],
-                                         kwargs['end_date'])
+        return self.filename_template % (kwargs["start_date"], kwargs["end_date"])
 
 
 class OpenBasketReportHTMLFormatter(ReportHTMLFormatter):
-    filename_template = 'oscar/dashboard/reports/partials/open_basket_report.html'
+    filename_template = "oscar/dashboard/reports/partials/open_basket_report.html"
 
 
 class OpenBasketReportGenerator(ReportGenerator):
     """
     Report of baskets which haven't been submitted yet
     """
-    code = 'open_baskets'
-    description = _('Open baskets')
-    date_range_field_name = 'date_created'
+
+    code = "open_baskets"
+    description = _("Open baskets")
+    date_range_field_name = "date_created"
     queryset = Basket._default_manager.filter(status=Basket.OPEN)
 
     formatters = {
-        'CSV_formatter': OpenBasketReportCSVFormatter,
-        'HTML_formatter': OpenBasketReportHTMLFormatter}
+        "CSV_formatter": OpenBasketReportCSVFormatter,
+        "HTML_formatter": OpenBasketReportHTMLFormatter,
+    }
 
     def generate(self):
-        additional_data = {
-            'start_date': self.start_date,
-            'end_date': self.end_date}
+        additional_data = {"start_date": self.start_date, "end_date": self.end_date}
         return self.formatter.generate_response(self.queryset, **additional_data)
 
 
 class SubmittedBasketReportCSVFormatter(ReportCSVFormatter):
-    filename_template = 'submitted_baskets-%s-%s.csv'
+    filename_template = "submitted_baskets-%s-%s.csv"
 
     def generate_csv(self, response, baskets):
         writer = self.get_csv_writer(response)
-        header_row = [_('User ID'),
-                      _('User'),
-                      _('Basket status'),
-                      _('Num lines'),
-                      _('Num items'),
-                      _('Date created'),
-                      _('Time between creation and submission'),
-                      ]
+        header_row = [
+            _("User ID"),
+            _("User"),
+            _("Basket status"),
+            _("Num lines"),
+            _("Num items"),
+            _("Date created"),
+            _("Time between creation and submission"),
+        ]
         writer.writerow(header_row)
 
         for basket in baskets:
-            row = [basket.owner_id,
-                   basket.owner,
-                   basket.status,
-                   basket.num_lines,
-                   basket.num_items,
-                   self.format_datetime(basket.date_created),
-                   basket.time_before_submit]
+            row = [
+                basket.owner_id,
+                basket.owner,
+                basket.status,
+                basket.num_lines,
+                basket.num_items,
+                self.format_datetime(basket.date_created),
+                basket.time_before_submit,
+            ]
             writer.writerow(row)
 
     def filename(self, **kwargs):
-        return self.filename_template % (kwargs['start_date'],
-                                         kwargs['end_date'])
+        return self.filename_template % (kwargs["start_date"], kwargs["end_date"])
 
 
 class SubmittedBasketReportHTMLFormatter(ReportHTMLFormatter):
-    filename_template = 'oscar/dashboard/reports/partials/submitted_basket_report.html'
+    filename_template = "oscar/dashboard/reports/partials/submitted_basket_report.html"
 
 
 class SubmittedBasketReportGenerator(ReportGenerator):
     """
     Report of baskets that have been submitted
     """
-    code = 'submitted_baskets'
-    description = _('Submitted baskets')
-    date_range_field_name = 'date_submitted'
+
+    code = "submitted_baskets"
+    description = _("Submitted baskets")
+    date_range_field_name = "date_submitted"
     queryset = Basket._default_manager.filter(status=Basket.SUBMITTED)
 
     formatters = {
-        'CSV_formatter': SubmittedBasketReportCSVFormatter,
-        'HTML_formatter': SubmittedBasketReportHTMLFormatter}
+        "CSV_formatter": SubmittedBasketReportCSVFormatter,
+        "HTML_formatter": SubmittedBasketReportHTMLFormatter,
+    }
 
     def generate(self):
-        additional_data = {
-            'start_date': self.start_date,
-            'end_date': self.end_date}
+        additional_data = {"start_date": self.start_date, "end_date": self.end_date}
         return self.formatter.generate_response(self.queryset, **additional_data)

src/oscar/apps/basket/utils.py

@@ -5,23 +5,23 @@ from django.template.loader import render_to_string
 
 from oscar.core.loading import get_class, get_model
 
-Applicator = get_class('offer.applicator', 'Applicator')
-ConditionalOffer = get_model('offer', 'ConditionalOffer')
+Applicator = get_class("offer.applicator", "Applicator")
+ConditionalOffer = get_model("offer", "ConditionalOffer")
 
 
 class BasketMessageGenerator(object):
-
-    new_total_template_name = 'oscar/basket/messages/new_total.html'
-    offer_lost_template_name = 'oscar/basket/messages/offer_lost.html'
-    offer_gained_template_name = 'oscar/basket/messages/offer_gained.html'
+    new_total_template_name = "oscar/basket/messages/new_total.html"
+    offer_lost_template_name = "oscar/basket/messages/offer_lost.html"
+    offer_gained_template_name = "oscar/basket/messages/offer_gained.html"
 
     def get_new_total_messages(self, basket, include_buttons=True):
         new_total_messages = []
         # We use the 'include_buttons' parameter to determine whether to show the
         # 'Checkout now' buttons.  We don't want to show these on the basket page.
-        msg = render_to_string(self.new_total_template_name,
-                               {'basket': basket,
-                                'include_buttons': include_buttons})
+        msg = render_to_string(
+            self.new_total_template_name,
+            {"basket": basket, "include_buttons": include_buttons},
+        )
         new_total_messages.append((messages.INFO, msg))
 
         return new_total_messages
@@ -30,7 +30,7 @@ class BasketMessageGenerator(object):
         offer_messages = []
         for offer_id in set(offers_before).difference(offers_after):
             offer = offers_before[offer_id]
-            msg = render_to_string(self.offer_lost_template_name, {'offer': offer})
+            msg = render_to_string(self.offer_lost_template_name, {"offer": offer})
             offer_messages.append((messages.WARNING, msg))
         return offer_messages
 
@@ -38,21 +38,23 @@ class BasketMessageGenerator(object):
         offer_messages = []
         for offer_id in set(offers_after).difference(offers_before):
             offer = offers_after[offer_id]
-            msg = render_to_string(self.offer_gained_template_name, {'offer': offer})
+            msg = render_to_string(self.offer_gained_template_name, {"offer": offer})
             offer_messages.append((messages.SUCCESS, msg))
         return offer_messages
 
     def get_offer_messages(self, offers_before, offers_after):
         offer_messages = []
         offer_messages.extend(self.get_offer_lost_messages(offers_before, offers_after))
-        offer_messages.extend(self.get_offer_gained_messages(offers_before, offers_after))
+        offer_messages.extend(
+            self.get_offer_gained_messages(offers_before, offers_after)
+        )
         return offer_messages
 
     def get_messages(self, basket, offers_before, offers_after, include_buttons=True):
-        messages = []
-        messages.extend(self.get_offer_messages(offers_before, offers_after))
-        messages.extend(self.get_new_total_messages(basket, include_buttons))
-        return messages
+        message_list = []
+        message_list.extend(self.get_offer_messages(offers_before, offers_after))
+        message_list.extend(self.get_new_total_messages(basket, include_buttons))
+        return message_list
 
     def apply_messages(self, request, offers_before):
         """
@@ -63,8 +65,10 @@ class BasketMessageGenerator(object):
         Applicator().apply(request.basket, request.user, request)
         offers_after = request.basket.applied_offers()
 
-        for level, msg in self.get_messages(request.basket, offers_before, offers_after):
-            messages.add_message(request, level, msg, extra_tags='safe noicon')
+        for level, msg in self.get_messages(
+            request.basket, offers_before, offers_after
+        ):
+            messages.add_message(request, level, msg, extra_tags="safe noicon")
 
 
 class LineOfferConsumer(object):
@@ -155,16 +159,17 @@ class LineOfferConsumer(object):
         max_affected_items = self._line.quantity
 
         if offer and isinstance(offer, ConditionalOffer):
-
             applied = [x for x in self.consumers if x != offer]
 
             if offer.exclusive:
                 for a in applied:
                     if a.exclusive:
-                        if any([
-                            a.priority > offer.priority,
-                            a.priority == offer.priority and a.id != offer.id
-                        ]):
+                        if any(
+                            [
+                                a.priority > offer.priority,
+                                a.priority == offer.priority and a.id != offer.id,
+                            ]
+                        ):
                             # Exclusive offers cannot be applied if any other exclusive
                             # offer with higher priority is active already.
                             max_affected_items = max_affected_items - self.consumed(a)

src/oscar/apps/basket/views.py

@@ -11,62 +11,66 @@ from django.utils.translation import gettext_lazy as _
 from django.views.generic import FormView, View
 from extra_views import ModelFormSetView
 
-from oscar.apps.basket.signals import (
-    basket_addition, voucher_addition, voucher_removal)
+from oscar.apps.basket.signals import basket_addition, voucher_addition, voucher_removal
 from oscar.core import ajax
 from oscar.core.loading import get_class, get_classes, get_model
 from oscar.core.utils import is_ajax, redirect_to_referrer, safe_referrer
 
-Applicator = get_class('offer.applicator', 'Applicator')
+Applicator = get_class("offer.applicator", "Applicator")
 (BasketLineForm, AddToBasketForm, BasketVoucherForm, SavedLineForm) = get_classes(
-    'basket.forms', ('BasketLineForm', 'AddToBasketForm',
-                     'BasketVoucherForm', 'SavedLineForm'))
+    "basket.forms",
+    ("BasketLineForm", "AddToBasketForm", "BasketVoucherForm", "SavedLineForm"),
+)
 BasketLineFormSet, SavedLineFormSet = get_classes(
-    'basket.formsets', ('BasketLineFormSet', 'SavedLineFormSet'))
-Repository = get_class('shipping.repository', 'Repository')
+    "basket.formsets", ("BasketLineFormSet", "SavedLineFormSet")
+)
+Repository = get_class("shipping.repository", "Repository")
 
-OrderTotalCalculator = get_class(
-    'checkout.calculators', 'OrderTotalCalculator')
-BasketMessageGenerator = get_class('basket.utils', 'BasketMessageGenerator')
+OrderTotalCalculator = get_class("checkout.calculators", "OrderTotalCalculator")
+BasketMessageGenerator = get_class("basket.utils", "BasketMessageGenerator")
 SurchargeApplicator = get_class("checkout.applicator", "SurchargeApplicator")
 
 
 class BasketView(ModelFormSetView):
-    model = get_model('basket', 'Line')
-    basket_model = get_model('basket', 'Basket')
+    model = get_model("basket", "Line")
+    basket_model = get_model("basket", "Basket")
     formset_class = BasketLineFormSet
     form_class = BasketLineForm
-    factory_kwargs = {
-        'extra': 0,
-        'can_delete': True
-    }
-    template_name = 'oscar/basket/basket.html'
+    factory_kwargs = {"extra": 0, "can_delete": True}
+    template_name = "oscar/basket/basket.html"
 
     def get_formset_kwargs(self):
         kwargs = super().get_formset_kwargs()
-        kwargs['strategy'] = self.request.strategy
+        kwargs["strategy"] = self.request.strategy
         return kwargs
 
     def get_queryset(self):
         """
         Return list of :py:class:`Line <oscar.apps.basket.abstract_models.AbstractLine>`
         instances associated with the current basket.
-        """  # noqa: E501
+        """
         return self.request.basket.all_lines()
 
+    # pylint: disable=unused-argument
     def get_shipping_methods(self, basket):
         return Repository().get_shipping_methods(
-            basket=self.request.basket, user=self.request.user,
-            request=self.request)
+            basket=self.request.basket, user=self.request.user, request=self.request
+        )
 
     def get_default_shipping_address(self):
         if self.request.user.is_authenticated:
-            return self.request.user.addresses.filter(is_default_for_shipping=True).first()
+            return self.request.user.addresses.filter(
+                is_default_for_shipping=True
+            ).first()
 
+    # pylint: disable=unused-argument
     def get_default_shipping_method(self, basket):
         return Repository().get_default_shipping_method(
-            basket=self.request.basket, user=self.request.user,
-            request=self.request, shipping_addr=self.get_default_shipping_address())
+            basket=self.request.basket,
+            user=self.request.user,
+            request=self.request,
+            shipping_addr=self.get_default_shipping_address(),
+        )
 
     def get_basket_warnings(self, basket):
         """
@@ -80,16 +84,15 @@ class BasketView(ModelFormSetView):
         return warnings
 
     def get_upsell_messages(self, basket):
-        offers = Applicator().get_offers(basket, self.request.user,
-                                         self.request)
+        offers = Applicator().get_offers(basket, self.request.user, self.request)
         applied_offers = list(basket.offer_applications.offers.values())
         msgs = []
         for offer in offers:
-            if offer.is_condition_partially_satisfied(basket) \
-                    and offer not in applied_offers:
-                data = {
-                    'message': offer.get_upsell_message(basket),
-                    'offer': offer}
+            if (
+                offer.is_condition_partially_satisfied(basket)
+                and offer not in applied_offers
+            ):
+                data = {"message": offer.get_upsell_message(basket), "offer": offer}
                 msgs.append(data)
         return msgs
 
@@ -102,52 +105,53 @@ class BasketView(ModelFormSetView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['voucher_form'] = self.get_basket_voucher_form()
+        context["voucher_form"] = self.get_basket_voucher_form()
 
         # Shipping information is included to give an idea of the total order
         # cost.  It is also important for PayPal Express where the customer
         # gets redirected away from the basket page and needs to see what the
         # estimated order total is beforehand.
-        context['shipping_methods'] = self.get_shipping_methods(
-            self.request.basket)
+        context["shipping_methods"] = self.get_shipping_methods(self.request.basket)
         method = self.get_default_shipping_method(self.request.basket)
-        context['shipping_method'] = method
+        context["shipping_method"] = method
         shipping_charge = method.calculate(self.request.basket)
-        context['shipping_charge'] = shipping_charge
+        context["shipping_charge"] = shipping_charge
         if method.is_discounted:
             excl_discount = method.calculate_excl_discount(self.request.basket)
-            context['shipping_charge_excl_discount'] = excl_discount
-        context['basket_warnings'] = self.get_basket_warnings(
-            self.request.basket)
-        context['upsell_messages'] = self.get_upsell_messages(
-            self.request.basket)
+            context["shipping_charge_excl_discount"] = excl_discount
+        context["basket_warnings"] = self.get_basket_warnings(self.request.basket)
+        context["upsell_messages"] = self.get_upsell_messages(self.request.basket)
 
         if self.request.user.is_authenticated:
             try:
-                saved_basket = self.basket_model.saved.get(
-                    owner=self.request.user)
+                saved_basket = self.basket_model.saved.get(owner=self.request.user)
             except self.basket_model.DoesNotExist:
                 pass
             else:
                 saved_basket.strategy = self.request.basket.strategy
                 if not saved_basket.is_empty:
                     saved_queryset = saved_basket.all_lines()
-                    formset = SavedLineFormSet(strategy=self.request.strategy,
-                                               basket=self.request.basket,
-                                               queryset=saved_queryset,
-                                               prefix='saved')
-                    context['saved_formset'] = formset
-
-        surcharges = SurchargeApplicator(self.request, context).get_applicable_surcharges(
+                    formset = SavedLineFormSet(
+                        strategy=self.request.strategy,
+                        basket=self.request.basket,
+                        queryset=saved_queryset,
+                        prefix="saved",
+                    )
+                    context["saved_formset"] = formset
+
+        surcharges = SurchargeApplicator(
+            self.request, context
+        ).get_applicable_surcharges(
             self.request.basket, shipping_charge=shipping_charge
         )
-        context['surcharges'] = surcharges
-        context['order_total'] = OrderTotalCalculator().calculate(
-            self.request.basket, shipping_charge, surcharges=surcharges)
+        context["surcharges"] = surcharges
+        context["order_total"] = OrderTotalCalculator().calculate(
+            self.request.basket, shipping_charge, surcharges=surcharges
+        )
         return context
 
     def get_success_url(self):
-        return safe_referrer(self.request, 'basket:summary')
+        return safe_referrer(self.request, "basket:summary")
 
     def formset_valid(self, formset):
         # Store offers before any changes are made so we can inform the user of
@@ -161,21 +165,21 @@ class BasketView(ModelFormSetView):
         flash_messages = ajax.FlashMessages()
 
         for form in formset:
-            if (hasattr(form, 'cleaned_data')
-                    and form.cleaned_data.get('save_for_later', False)):
+            if hasattr(form, "cleaned_data") and form.cleaned_data.get(
+                "save_for_later", False
+            ):
                 line = form.instance
                 if self.request.user.is_authenticated:
                     self.move_line_to_saved_basket(line)
 
                     msg = render_to_string(
-                        'oscar/basket/messages/line_saved.html',
-                        {'line': line})
+                        "oscar/basket/messages/line_saved.html", {"line": line}
+                    )
                     flash_messages.info(msg)
 
                     save_for_later = True
                 else:
-                    msg = _("You can't save an item for later if you're "
-                            "not logged in!")
+                    msg = _("You can't save an item for later if you're not logged in!")
                     flash_messages.error(msg)
                     return redirect(self.get_success_url())
 
@@ -189,15 +193,16 @@ class BasketView(ModelFormSetView):
         # If AJAX submission, don't redirect but reload the basket content HTML
         if is_ajax(self.request):
             # Reload basket and apply offers again
-            self.request.basket = get_model('basket', 'Basket').objects.get(
-                id=self.request.basket.id)
+            self.request.basket = get_model("basket", "Basket").objects.get(
+                id=self.request.basket.id
+            )
             self.request.basket.strategy = self.request.strategy
-            Applicator().apply(self.request.basket, self.request.user,
-                               self.request)
+            Applicator().apply(self.request.basket, self.request.user, self.request)
             offers_after = self.request.basket.applied_offers()
 
             for level, msg in BasketMessageGenerator().get_messages(
-                    self.request.basket, offers_before, offers_after, include_buttons=False):
+                self.request.basket, offers_before, offers_after, include_buttons=False
+            ):
                 flash_messages.add_message(level, msg)
 
             # Reload formset - we have to remove the POST fields from the
@@ -205,14 +210,12 @@ class BasketView(ModelFormSetView):
             # correctly as there will be a state mismatch between the
             # management form and the database.
             kwargs = self.get_formset_kwargs()
-            del kwargs['data']
-            del kwargs['files']
-            if 'queryset' in kwargs:
-                del kwargs['queryset']
-            formset = self.get_formset()(queryset=self.get_queryset(),
-                                         **kwargs)
-            ctx = self.get_context_data(formset=formset,
-                                        basket=self.request.basket)
+            del kwargs["data"]
+            del kwargs["files"]
+            if "queryset" in kwargs:
+                del kwargs["queryset"]
+            formset = self.get_formset()(queryset=self.get_queryset(), **kwargs)
+            ctx = self.get_context_data(formset=formset, basket=self.request.basket)
             return self.json_response(ctx, flash_messages)
 
         BasketMessageGenerator().apply_messages(self.request, offers_before)
@@ -221,36 +224,42 @@ class BasketView(ModelFormSetView):
 
     def json_response(self, ctx, flash_messages):
         basket_html = render_to_string(
-            'oscar/basket/partials/basket_content.html',
-            context=ctx, request=self.request)
+            "oscar/basket/partials/basket_content.html",
+            context=ctx,
+            request=self.request,
+        )
 
-        return JsonResponse({
-            'content_html': basket_html,
-            'messages': flash_messages.as_dict()
-        })
+        return JsonResponse(
+            {"content_html": basket_html, "messages": flash_messages.as_dict()}
+        )
 
     def move_line_to_saved_basket(self, line):
-        saved_basket, _ = get_model('basket', 'basket').saved.get_or_create(
-            owner=self.request.user)
+        saved_basket, _ = get_model("basket", "basket").saved.get_or_create(
+            owner=self.request.user
+        )
         saved_basket.merge_line(line)
 
     def formset_invalid(self, formset):
         has_deletion = any(formset._should_delete_form(form) for form in formset.forms)
-        has_no_invalid_non_deletion = all(form.is_valid() or formset._should_delete_form(form)
-                                          for form in formset.forms)
+        has_no_invalid_non_deletion = all(
+            form.is_valid() or formset._should_delete_form(form)
+            for form in formset.forms
+        )
         if has_deletion:
             self.remove_deleted_forms(formset)
             if has_no_invalid_non_deletion:
                 return self.formset_valid(formset)
 
         flash_messages = ajax.FlashMessages()
-        flash_messages.warning(_(
-            "Your basket has got some issues. "
-            "Please correct any validation errors below."))
+        flash_messages.warning(
+            _(
+                "Your basket has got some issues. "
+                "Please correct any validation errors below."
+            )
+        )
 
         if is_ajax(self.request):
-            ctx = self.get_context_data(formset=formset,
-                                        basket=self.request.basket)
+            ctx = self.get_context_data(formset=formset, basket=self.request.basket)
             return self.json_response(ctx, flash_messages)
 
         flash_messages.apply_to_request(self.request)
@@ -282,13 +291,15 @@ class BasketView(ModelFormSetView):
                     form.prefix = new_form_prefix
                     new_prefixed_field_name = form.add_prefix(field_name)
                     try:
-                        form_data[new_prefixed_field_name] = formset.data[old_prefixed_field_name]
+                        form_data[new_prefixed_field_name] = formset.data[
+                            old_prefixed_field_name
+                        ]
                     except KeyError:
                         pass
                 form_index += 1
         for field_name in formset.management_form.fields:
             prefixed_field_name = formset.management_form.add_prefix(field_name)
-            if field_name in ['INITIAL_FORMS', 'TOTAL_FORMS']:
+            if field_name in ["INITIAL_FORMS", "TOTAL_FORMS"]:
                 form_data[prefixed_field_name] = str(form_index)
             else:
                 form_data[prefixed_field_name] = formset.data[prefixed_field_name]
@@ -310,27 +321,28 @@ class BasketAddView(FormView):
     parts of the site. The add-to-basket form is loaded into templates using
     a templatetag from :py:mod:`oscar.templatetags.basket_tags`.
     """
+
     form_class = AddToBasketForm
-    product_model = get_model('catalogue', 'product')
+    product_model = get_model("catalogue", "product")
     add_signal = basket_addition
-    http_method_names = ['post']
+    http_method_names = ["post"]
 
     def post(self, request, *args, **kwargs):
-        self.product = shortcuts.get_object_or_404(
-            self.product_model, pk=kwargs['pk'])
+        # pylint: disable=W0201
+        self.product = shortcuts.get_object_or_404(self.product_model, pk=kwargs["pk"])
         return super().post(request, *args, **kwargs)
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['basket'] = self.request.basket
-        kwargs['product'] = self.product
+        kwargs["basket"] = self.request.basket
+        kwargs["product"] = self.product
         return kwargs
 
     def form_invalid(self, form):
         msgs = []
         for error in form.errors.values():
             msgs.append(error.as_text())
-        clean_msgs = [m.replace('* ', '') for m in msgs if m.startswith('* ')]
+        clean_msgs = [m.replace("* ", "") for m in msgs if m.startswith("* ")]
         messages.error(self.request, ",".join(clean_msgs))
 
         # We serialize the POST data with JSONSerializer before adding it to the session.
@@ -338,64 +350,72 @@ class BasketAddView(FormView):
         # if the SESSION_SERIALIZER has been configured to 'django.contrib.sessions.serializers.PickleSerializer'.
         # see: https://docs.djangoproject.com/en/3.2/topics/http/sessions/#cookie-session-backend
         serialized_data = JSONSerializer().dumps(self.request.POST)
-        self.request.session["add_to_basket_form_post_data_%s" % self.product.pk] = serialized_data.decode("latin-1")
+        self.request.session[
+            "add_to_basket_form_post_data_%s" % self.product.pk
+        ] = serialized_data.decode("latin-1")
 
-        return redirect_to_referrer(self.request, 'basket:summary')
+        return redirect_to_referrer(self.request, "basket:summary")
 
     def form_valid(self, form):
         offers_before = self.request.basket.applied_offers()
 
         self.request.basket.add_product(
-            form.product, form.cleaned_data['quantity'],
-            form.cleaned_options())
+            form.product, form.cleaned_data["quantity"], form.cleaned_options()
+        )
 
-        messages.success(self.request, self.get_success_message(form),
-                         extra_tags='safe noicon')
+        messages.success(
+            self.request, self.get_success_message(form), extra_tags="safe noicon"
+        )
 
         # Check for additional offer messages
         BasketMessageGenerator().apply_messages(self.request, offers_before)
 
         # Send signal for basket addition
         self.add_signal.send(
-            sender=self, product=form.product, user=self.request.user,
-            request=self.request)
+            sender=self,
+            product=form.product,
+            user=self.request.user,
+            request=self.request,
+        )
 
         return super().form_valid(form)
 
     def get_success_message(self, form):
         return render_to_string(
-            'oscar/basket/messages/addition.html',
-            {'product': form.product,
-             'quantity': form.cleaned_data['quantity']})
+            "oscar/basket/messages/addition.html",
+            {"product": form.product, "quantity": form.cleaned_data["quantity"]},
+        )
 
     def get_success_url(self):
-        post_url = self.request.POST.get('next')
-        if post_url and url_has_allowed_host_and_scheme(post_url, self.request.get_host()):
+        post_url = self.request.POST.get("next")
+        if post_url and url_has_allowed_host_and_scheme(
+            post_url, self.request.get_host()
+        ):
             return post_url
-        return safe_referrer(self.request, 'basket:summary')
+        return safe_referrer(self.request, "basket:summary")
 
 
 class VoucherAddView(FormView):
     form_class = BasketVoucherForm
-    voucher_model = get_model('voucher', 'voucher')
+    voucher_model = get_model("voucher", "voucher")
     add_signal = voucher_addition
 
     def get(self, request, *args, **kwargs):
-        return redirect('basket:summary')
+        return redirect("basket:summary")
 
     def apply_voucher_to_basket(self, voucher):
         if voucher.is_expired():
             messages.error(
                 self.request,
-                _("The '%(code)s' voucher has expired") % {
-                    'code': voucher.code})
+                _("The '%(code)s' voucher has expired") % {"code": voucher.code},
+            )
             return
 
         if not voucher.is_active():
             messages.error(
                 self.request,
-                _("The '%(code)s' voucher is not active") % {
-                    'code': voucher.code})
+                _("The '%(code)s' voucher is not active") % {"code": voucher.code},
+            )
             return
 
         is_available, message = voucher.is_available_to_user(self.request.user)
@@ -406,66 +426,65 @@ class VoucherAddView(FormView):
         self.request.basket.vouchers.add(voucher)
 
         # Raise signal
-        self.add_signal.send(
-            sender=self, basket=self.request.basket, voucher=voucher)
+        self.add_signal.send(sender=self, basket=self.request.basket, voucher=voucher)
 
         # Recalculate discounts to see if the voucher gives any
-        Applicator().apply(self.request.basket, self.request.user,
-                           self.request)
+        Applicator().apply(self.request.basket, self.request.user, self.request)
         discounts_after = self.request.basket.offer_applications
 
         # Look for discounts from this new voucher
         found_discount = False
         for discount in discounts_after:
-            if discount['voucher'] and discount['voucher'] == voucher:
+            if discount["voucher"] and discount["voucher"] == voucher:
                 found_discount = True
                 break
         if not found_discount:
             messages.warning(
-                self.request,
-                _("Your basket does not qualify for a voucher discount"))
+                self.request, _("Your basket does not qualify for a voucher discount")
+            )
             self.request.basket.vouchers.remove(voucher)
         else:
             messages.info(
                 self.request,
-                _("Voucher '%(code)s' added to basket") % {
-                    'code': voucher.code})
+                _("Voucher '%(code)s' added to basket") % {"code": voucher.code},
+            )
 
     def form_valid(self, form):
-        code = form.cleaned_data['code']
+        code = form.cleaned_data["code"]
         if not self.request.basket.id:
-            return redirect_to_referrer(self.request, 'basket:summary')
+            return redirect_to_referrer(self.request, "basket:summary")
         if self.request.basket.contains_voucher(code):
             messages.error(
                 self.request,
-                _("You have already added the '%(code)s' voucher to "
-                  "your basket") % {'code': code})
+                _("You have already added the '%(code)s' voucher to your basket")
+                % {"code": code},
+            )
         else:
             try:
                 voucher = self.voucher_model._default_manager.get(code=code)
             except self.voucher_model.DoesNotExist:
                 messages.error(
                     self.request,
-                    _("No voucher found with code '%(code)s'") % {
-                        'code': code})
+                    _("No voucher found with code '%(code)s'") % {"code": code},
+                )
             else:
                 self.apply_voucher_to_basket(voucher)
-        return redirect_to_referrer(self.request, 'basket:summary')
+        return redirect_to_referrer(self.request, "basket:summary")
 
     def form_invalid(self, form):
         messages.error(self.request, _("Please enter a voucher code"))
-        return redirect(reverse('basket:summary') + '#voucher')
+        return redirect(reverse("basket:summary") + "#voucher")
 
 
 class VoucherRemoveView(View):
-    voucher_model = get_model('voucher', 'voucher')
+    voucher_model = get_model("voucher", "voucher")
     remove_signal = voucher_removal
-    http_method_names = ['post']
+    http_method_names = ["post"]
 
     def post(self, request, *args, **kwargs):
-        response = redirect('basket:summary')
+        response = redirect("basket:summary")
 
-        voucher_id = kwargs['pk']
+        voucher_id = kwargs["pk"]
         if not request.basket.id:
             # Hacking attempt - the basket must be saved for it to have
             # a voucher in it.
@@ -473,37 +492,31 @@ class VoucherRemoveView(View):
         try:
             voucher = request.basket.vouchers.get(id=voucher_id)
         except ObjectDoesNotExist:
-            messages.error(
-                request, _("No voucher found with id '%s'") % voucher_id)
+            messages.error(request, _("No voucher found with id '%s'") % voucher_id)
         else:
             request.basket.vouchers.remove(voucher)
-            self.remove_signal.send(
-                sender=self, basket=request.basket, voucher=voucher)
-            messages.info(
-                request, _("Voucher '%s' removed from basket") % voucher.code)
+            self.remove_signal.send(sender=self, basket=request.basket, voucher=voucher)
+            messages.info(request, _("Voucher '%s' removed from basket") % voucher.code)
 
         return response
 
 
 class SavedView(ModelFormSetView):
-    model = get_model('basket', 'line')
-    basket_model = get_model('basket', 'basket')
+    model = get_model("basket", "line")
+    basket_model = get_model("basket", "basket")
     formset_class = SavedLineFormSet
     form_class = SavedLineForm
-    factory_kwargs = {
-        'extra': 0,
-        'can_delete': True
-    }
+    factory_kwargs = {"extra": 0, "can_delete": True}
 
     def get(self, request, *args, **kwargs):
-        return redirect('basket:summary')
+        return redirect("basket:summary")
 
     def get_queryset(self):
         """
         Return list of :py:class:`Line <oscar.apps.basket.abstract_models.AbstractLine>`
         instances associated with the saved basked associated with the currently
         authenticated user.
-        """  # noqa: E501
+        """
         try:
             saved_basket = self.basket_model.saved.get(owner=self.request.user)
             saved_basket.strategy = self.request.strategy
@@ -512,13 +525,13 @@ class SavedView(ModelFormSetView):
             return []
 
     def get_success_url(self):
-        return safe_referrer(self.request, 'basket:summary')
+        return safe_referrer(self.request, "basket:summary")
 
     def get_formset_kwargs(self):
         kwargs = super().get_formset_kwargs()
-        kwargs['prefix'] = 'saved'
-        kwargs['basket'] = self.request.basket
-        kwargs['strategy'] = self.request.strategy
+        kwargs["prefix"] = "saved"
+        kwargs["basket"] = self.request.basket
+        kwargs["strategy"] = self.request.strategy
         return kwargs
 
     def formset_valid(self, formset):
@@ -526,12 +539,12 @@ class SavedView(ModelFormSetView):
 
         is_move = False
         for form in formset:
-            if form.cleaned_data.get('move_to_basket', False):
+            if form.cleaned_data.get("move_to_basket", False):
                 is_move = True
                 msg = render_to_string(
-                    'oscar/basket/messages/line_restored.html',
-                    {'line': form.instance})
-                messages.info(self.request, msg, extra_tags='safe noicon')
+                    "oscar/basket/messages/line_restored.html", {"line": form.instance}
+                )
+                messages.info(self.request, msg, extra_tags="safe noicon")
                 real_basket = self.request.basket
                 real_basket.merge_line(form.instance)
 
@@ -547,7 +560,8 @@ class SavedView(ModelFormSetView):
     def formset_invalid(self, formset):
         messages.error(
             self.request,
-            '\n'.join(
-                error for ed in formset.errors for el
-                in ed.values() for error in el))
-        return redirect_to_referrer(self.request, 'basket:summary')
+            "\n".join(
+                error for ed in formset.errors for el in ed.values() for error in el
+            ),
+        )
+        return redirect_to_referrer(self.request, "basket:summary")

src/oscar/apps/catalogue/__init__.py

@@ -1 +1 @@
-default_app_config = 'oscar.apps.catalogue.apps.CatalogueConfig'
+default_app_config = "oscar.apps.catalogue.apps.CatalogueConfig"

src/oscar/apps/catalogue/admin.py

@@ -4,17 +4,17 @@ from treebeard.forms import movenodeform_factory
 
 from oscar.core.loading import get_model
 
-AttributeOption = get_model('catalogue', 'AttributeOption')
-AttributeOptionGroup = get_model('catalogue', 'AttributeOptionGroup')
-Category = get_model('catalogue', 'Category')
-Option = get_model('catalogue', 'Option')
-Product = get_model('catalogue', 'Product')
-ProductAttribute = get_model('catalogue', 'ProductAttribute')
-ProductAttributeValue = get_model('catalogue', 'ProductAttributeValue')
-ProductCategory = get_model('catalogue', 'ProductCategory')
-ProductClass = get_model('catalogue', 'ProductClass')
-ProductImage = get_model('catalogue', 'ProductImage')
-ProductRecommendation = get_model('catalogue', 'ProductRecommendation')
+AttributeOption = get_model("catalogue", "AttributeOption")
+AttributeOptionGroup = get_model("catalogue", "AttributeOptionGroup")
+Category = get_model("catalogue", "Category")
+Option = get_model("catalogue", "Option")
+Product = get_model("catalogue", "Product")
+ProductAttribute = get_model("catalogue", "ProductAttribute")
+ProductAttributeValue = get_model("catalogue", "ProductAttributeValue")
+ProductCategory = get_model("catalogue", "ProductCategory")
+ProductClass = get_model("catalogue", "ProductClass")
+ProductImage = get_model("catalogue", "ProductImage")
+ProductRecommendation = get_model("catalogue", "ProductRecommendation")
 
 
 class AttributeInline(admin.TabularInline):
@@ -23,8 +23,8 @@ class AttributeInline(admin.TabularInline):
 
 class ProductRecommendationInline(admin.TabularInline):
     model = ProductRecommendation
-    fk_name = 'primary'
-    raw_id_fields = ['primary', 'recommendation']
+    fk_name = "primary"
+    raw_id_fields = ["primary", "recommendation"]
 
 
 class CategoryInline(admin.TabularInline):
@@ -38,33 +38,36 @@ class ProductAttributeInline(admin.TabularInline):
 
 
 class ProductClassAdmin(admin.ModelAdmin):
-    list_display = ('name', 'requires_shipping', 'track_stock')
+    list_display = ("name", "requires_shipping", "track_stock")
     inlines = [ProductAttributeInline]
 
 
 class ProductAdmin(admin.ModelAdmin):
-    date_hierarchy = 'date_created'
-    list_display = ('get_title', 'upc', 'get_product_class', 'structure',
-                    'attribute_summary', 'date_created')
-    list_filter = ['structure', 'is_discountable']
-    raw_id_fields = ['parent']
+    date_hierarchy = "date_created"
+    list_display = (
+        "get_title",
+        "upc",
+        "get_product_class",
+        "structure",
+        "attribute_summary",
+        "date_created",
+    )
+    list_filter = ["structure", "is_discountable"]
+    raw_id_fields = ["parent"]
     inlines = [AttributeInline, CategoryInline, ProductRecommendationInline]
     prepopulated_fields = {"slug": ("title",)}
-    search_fields = ['upc', 'title']
+    search_fields = ["upc", "title"]
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)
-        return (
-            qs
-            .select_related('product_class', 'parent')
-            .prefetch_related(
-                'attribute_values',
-                'attribute_values__attribute'))
+        return qs.select_related("product_class", "parent").prefetch_related(
+            "attribute_values", "attribute_values__attribute"
+        )
 
 
 class ProductAttributeAdmin(admin.ModelAdmin):
-    list_display = ('name', 'code', 'product_class', 'type')
-    prepopulated_fields = {"code": ("name", )}
+    list_display = ("name", "code", "product_class", "type")
+    prepopulated_fields = {"code": ("name",)}
 
 
 class OptionAdmin(admin.ModelAdmin):
@@ -72,7 +75,7 @@ class OptionAdmin(admin.ModelAdmin):
 
 
 class ProductAttributeValueAdmin(admin.ModelAdmin):
-    list_display = ('product', 'attribute', 'value')
+    list_display = ("product", "attribute", "value")
 
 
 class AttributeOptionInline(admin.TabularInline):
@@ -80,13 +83,15 @@ class AttributeOptionInline(admin.TabularInline):
 
 
 class AttributeOptionGroupAdmin(admin.ModelAdmin):
-    list_display = ('name', 'option_summary')
-    inlines = [AttributeOptionInline, ]
+    list_display = ("name", "option_summary")
+    inlines = [
+        AttributeOptionInline,
+    ]
 
 
 class CategoryAdmin(TreeAdmin):
     form = movenodeform_factory(Category)
-    list_display = ('name', 'slug')
+    list_display = ("name", "slug")
 
 
 admin.site.register(ProductClass, ProductClassAdmin)

src/oscar/apps/catalogue/apps.py

@@ -7,53 +7,62 @@ from oscar.core.loading import get_class
 
 
 class CatalogueOnlyConfig(OscarConfig):
-    label = 'catalogue'
-    name = 'oscar.apps.catalogue'
-    verbose_name = _('Catalogue')
+    label = "catalogue"
+    name = "oscar.apps.catalogue"
+    verbose_name = _("Catalogue")
 
-    namespace = 'catalogue'
+    namespace = "catalogue"
 
+    # pylint: disable=attribute-defined-outside-init, unused-import
     def ready(self):
-        from . import receivers  # noqa
+        from . import receivers
 
         super().ready()
 
-        self.detail_view = get_class('catalogue.views', 'ProductDetailView')
-        self.catalogue_view = get_class('catalogue.views', 'CatalogueView')
-        self.category_view = get_class('catalogue.views', 'ProductCategoryView')
-        self.range_view = get_class('offer.views', 'RangeDetailView')
+        self.detail_view = get_class("catalogue.views", "ProductDetailView")
+        self.catalogue_view = get_class("catalogue.views", "CatalogueView")
+        self.category_view = get_class("catalogue.views", "ProductCategoryView")
+        self.range_view = get_class("offer.views", "RangeDetailView")
 
     def get_urls(self):
         urls = super().get_urls()
         urls += [
-            path('', self.catalogue_view.as_view(), name='index'),
+            path("", self.catalogue_view.as_view(), name="index"),
             re_path(
-                r'^(?P<product_slug>[\w-]*)_(?P<pk>\d+)/$',
-                self.detail_view.as_view(), name='detail'),
+                r"^(?P<product_slug>[\w-]*)_(?P<pk>\d+)/$",
+                self.detail_view.as_view(),
+                name="detail",
+            ),
             re_path(
-                r'^category/(?P<category_slug>[\w-]+(/[\w-]+)*)_(?P<pk>\d+)/$',
-                self.category_view.as_view(), name='category'),
-            path('ranges/<slug:slug>/', self.range_view.as_view(), name='range'),
+                r"^category/(?P<category_slug>[\w-]+(/[\w-]+)*)_(?P<pk>\d+)/$",
+                self.category_view.as_view(),
+                name="category",
+            ),
+            path("ranges/<slug:slug>/", self.range_view.as_view(), name="range"),
         ]
         return self.post_process_urls(urls)
 
 
 class CatalogueReviewsOnlyConfig(OscarConfig):
-    label = 'catalogue'
-    name = 'oscar.apps.catalogue'
-    verbose_name = _('Catalogue')
+    label = "catalogue"
+    name = "oscar.apps.catalogue"
+    verbose_name = _("Catalogue")
 
+    # pylint: disable=attribute-defined-outside-init, unused-import
     def ready(self):
-        from . import receivers  # noqa
+        from . import receivers
 
         super().ready()
 
-        self.reviews_app = apps.get_app_config('reviews')
+        self.reviews_app = apps.get_app_config("reviews")
 
     def get_urls(self):
         urls = super().get_urls()
         urls += [
-            re_path(r'^(?P<product_slug>[\w-]*)_(?P<product_pk>\d+)/reviews/', include(self.reviews_app.urls[0])),
+            re_path(
+                r"^(?P<product_slug>[\w-]*)_(?P<product_pk>\d+)/reviews/",
+                include(self.reviews_app.urls[0]),
+            ),
         ]
         return self.post_process_urls(urls)
 

src/oscar/apps/catalogue/categories.py

@@ -1,6 +1,6 @@
 from oscar.core.loading import get_model
 
-Category = get_model('catalogue', 'category')
+Category = get_model("catalogue", "category")
 
 
 def create_from_sequence(bits):
@@ -16,9 +16,9 @@ def create_from_sequence(bits):
         except Category.DoesNotExist:
             root = Category.add_root(name=name)
         except Category.MultipleObjectsReturned:
-            raise ValueError((
-                "There are more than one categories with name "
-                "%s at depth=1") % name)
+            raise ValueError(
+                ("There are more than one categories with name %s at depth=1") % name
+            )
         return [root]
     else:
         parents = create_from_sequence(bits[:-1])
@@ -28,14 +28,18 @@ def create_from_sequence(bits):
         except Category.DoesNotExist:
             child = parent.add_child(name=name)
         except Category.MultipleObjectsReturned:
-            raise ValueError((
-                "There are more than one categories with name "
-                "%s which are children of %s") % (name, parent))
+            raise ValueError(
+                (
+                    "There are more than one categories with name "
+                    "%s which are children of %s"
+                )
+                % (name, parent)
+            )
         parents.append(child)
         return parents
 
 
-def create_from_breadcrumbs(breadcrumb_str, separator='>'):
+def create_from_breadcrumbs(breadcrumb_str, separator=">"):
     """
     Create categories from a breadcrumb string
     """

src/oscar/apps/catalogue/expressions.py

@@ -20,6 +20,7 @@ WHERE "CATALOGUE_CATEGORY_BASE"."id" IN (%(subquery)s))
 """
 
 
+# pylint: disable=abstract-method
 class ExpandUpwardsCategoryQueryset(Subquery):
     template = EXPAND_UPWARDS_CATEGORY_QUERY
 
@@ -27,6 +28,7 @@ class ExpandUpwardsCategoryQueryset(Subquery):
         return super().as_sql(compiler, connection, self.template[1:-1])
 
 
+# pylint: disable=abstract-method
 class ExpandDownwardsCategoryQueryset(Subquery):
     template = EXPAND_DOWNWARDS_CATEGORY_QUERY
 

src/oscar/apps/catalogue/managers.py

@@ -57,7 +57,9 @@ class AttributeFilter(dict):
 
         for code, (lookup, value) in self.items():
             selected_values = self._select_value(typedict[code], lookup, value)
-            if not selected_values:  # if no value clause can be formed, no result can be formed.
+            if (
+                not selected_values
+            ):  # if no value clause can be formed, no result can be formed.
                 return queryset.none()
 
             qs = qs.filter(
@@ -69,7 +71,6 @@ class AttributeFilter(dict):
 
 
 class ProductQuerySet(models.query.QuerySet):
-
     def filter_by_attributes(self, **filter_kwargs):
         """
         Allows querying by attribute as if the attributes where fields on the
@@ -93,13 +94,25 @@ class ProductQuerySet(models.query.QuerySet):
         Applies select_related and prefetch_related for commonly related
         models to save on queries
         """
-        Option = get_model('catalogue', 'Option')
-        product_class_options = Option.objects.filter(productclass=OuterRef('product_class'))
-        product_options = Option.objects.filter(product=OuterRef('pk'))
-        return self.select_related('product_class')\
-            .prefetch_related('children', 'product_options', 'product_class__options', 'stockrecords', 'images') \
-            .annotate(has_product_class_options=Exists(product_class_options),
-                      has_product_options=Exists(product_options))
+        Option = get_model("catalogue", "Option")
+        product_class_options = Option.objects.filter(
+            productclass=OuterRef("product_class")
+        )
+        product_options = Option.objects.filter(product=OuterRef("pk"))
+        return (
+            self.select_related("product_class")
+            .prefetch_related(
+                "children",
+                "product_options",
+                "product_class__options",
+                "stockrecords",
+                "images",
+            )
+            .annotate(
+                has_product_class_options=Exists(product_class_options),
+                has_product_options=Exists(product_options),
+            )
+        )
 
     def browsable(self):
         """
@@ -123,7 +136,6 @@ class ProductQuerySet(models.query.QuerySet):
 
 
 class CategoryQuerySet(MP_NodeQuerySet):
-
     def browsable(self):
         """
         Excludes non-public categories

src/oscar/apps/catalogue/models.py

@@ -1,84 +1,97 @@
+# pylint: disable=wildcard-import, unused-wildcard-import
+
 """
 Vanilla product models
 """
-from oscar.apps.catalogue.abstract_models import *  # noqa
+from oscar.apps.catalogue.abstract_models import *
 from oscar.core.loading import is_model_registered
 
-__all__ = ['ProductAttributesContainer']
+__all__ = ["ProductAttributesContainer"]
+
 
+if not is_model_registered("catalogue", "ProductClass"):
 
-if not is_model_registered('catalogue', 'ProductClass'):
     class ProductClass(AbstractProductClass):
         pass
 
-    __all__.append('ProductClass')
+    __all__.append("ProductClass")
+
 
+if not is_model_registered("catalogue", "Category"):
 
-if not is_model_registered('catalogue', 'Category'):
     class Category(AbstractCategory):
         pass
 
-    __all__.append('Category')
+    __all__.append("Category")
 
 
-if not is_model_registered('catalogue', 'ProductCategory'):
+if not is_model_registered("catalogue", "ProductCategory"):
+
     class ProductCategory(AbstractProductCategory):
         pass
 
-    __all__.append('ProductCategory')
+    __all__.append("ProductCategory")
+
 
+if not is_model_registered("catalogue", "Product"):
 
-if not is_model_registered('catalogue', 'Product'):
     class Product(AbstractProduct):
         pass
 
-    __all__.append('Product')
+    __all__.append("Product")
+
 
+if not is_model_registered("catalogue", "ProductRecommendation"):
 
-if not is_model_registered('catalogue', 'ProductRecommendation'):
     class ProductRecommendation(AbstractProductRecommendation):
         pass
 
-    __all__.append('ProductRecommendation')
+    __all__.append("ProductRecommendation")
 
 
-if not is_model_registered('catalogue', 'ProductAttribute'):
+if not is_model_registered("catalogue", "ProductAttribute"):
+
     class ProductAttribute(AbstractProductAttribute):
         pass
 
-    __all__.append('ProductAttribute')
+    __all__.append("ProductAttribute")
+
 
+if not is_model_registered("catalogue", "ProductAttributeValue"):
 
-if not is_model_registered('catalogue', 'ProductAttributeValue'):
     class ProductAttributeValue(AbstractProductAttributeValue):
         pass
 
-    __all__.append('ProductAttributeValue')
+    __all__.append("ProductAttributeValue")
+
 
+if not is_model_registered("catalogue", "AttributeOptionGroup"):
 
-if not is_model_registered('catalogue', 'AttributeOptionGroup'):
     class AttributeOptionGroup(AbstractAttributeOptionGroup):
         pass
 
-    __all__.append('AttributeOptionGroup')
+    __all__.append("AttributeOptionGroup")
 
 
-if not is_model_registered('catalogue', 'AttributeOption'):
+if not is_model_registered("catalogue", "AttributeOption"):
+
     class AttributeOption(AbstractAttributeOption):
         pass
 
-    __all__.append('AttributeOption')
+    __all__.append("AttributeOption")
+
 
+if not is_model_registered("catalogue", "Option"):
 
-if not is_model_registered('catalogue', 'Option'):
     class Option(AbstractOption):
         pass
 
-    __all__.append('Option')
+    __all__.append("Option")
+
 
+if not is_model_registered("catalogue", "ProductImage"):
 
-if not is_model_registered('catalogue', 'ProductImage'):
     class ProductImage(AbstractProductImage):
         pass
 
-    __all__.append('ProductImage')
+    __all__.append("ProductImage")

src/oscar/apps/catalogue/product_attributes.py

@@ -15,6 +15,7 @@ class ProductAttributesContainer:
         product.attr.refresh()
     """
 
+    # pylint: disable=access-member-before-definition
     def __setstate__(self, state):
         self.__dict__.setdefault("_product", None)
         self.__dict__.setdefault("_initialized", False)

src/oscar/apps/catalogue/receivers.py

@@ -13,8 +13,9 @@ if settings.OSCAR_DELETE_IMAGE_FILES:
 
     from oscar.core.thumbnails import get_thumbnailer
 
-    ProductImage = get_model('catalogue', 'ProductImage')
+    ProductImage = get_model("catalogue", "ProductImage")
 
+    # pylint: disable=unused-argument
     def delete_image_files(sender, instance, **kwargs):
         """
         Deletes the original image and created thumbnails.
@@ -29,11 +30,12 @@ if settings.OSCAR_DELETE_IMAGE_FILES:
 
     # Connect for all models with ImageFields - add as needed
     models_with_images = [ProductImage, Category]
-    for sender in models_with_images:
-        post_delete.connect(delete_image_files, sender=sender)
+    for image_instance in models_with_images:
+        post_delete.connect(delete_image_files, sender=image_instance)
 
 
-@receiver(post_save, sender=Category, dispatch_uid='set_ancestors_are_public')
+# pylint: disable=unused-argument
+@receiver(post_save, sender=Category, dispatch_uid="set_ancestors_are_public")
 def post_save_set_ancestors_are_public(sender, instance, **kwargs):
     if kwargs.get("raw"):
         return

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

@@ -1 +1 @@
-default_app_config = 'oscar.apps.catalogue.reviews.apps.CatalogueReviewsConfig'
+default_app_config = "oscar.apps.catalogue.reviews.apps.CatalogueReviewsConfig"

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

@@ -10,7 +10,7 @@ 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')
+ProductReviewQuerySet = get_class("catalogue.reviews.managers", "ProductReviewQuerySet")
 
 
 class AbstractProductReview(models.Model):
@@ -21,8 +21,8 @@ class AbstractProductReview(models.Model):
     """
 
     product = models.ForeignKey(
-        'catalogue.Product', related_name='reviews', null=True,
-        on_delete=models.CASCADE)
+        "catalogue.Product", related_name="reviews", null=True, on_delete=models.CASCADE
+    )
 
     # Scores are between 0 and 5
     SCORE_CHOICES = tuple([(x, x) for x in range(0, 6)])
@@ -30,7 +30,9 @@ class AbstractProductReview(models.Model):
 
     title = models.CharField(
         verbose_name=pgettext_lazy("Product review title", "Title"),
-        max_length=255, validators=[validators.non_whitespace])
+        max_length=255,
+        validators=[validators.non_whitespace],
+    )
 
     body = models.TextField(_("Body"))
 
@@ -40,12 +42,13 @@ class AbstractProductReview(models.Model):
         blank=True,
         null=True,
         on_delete=models.CASCADE,
-        related_name='reviews')
+        related_name="reviews",
+    )
 
     # Fields to be completed if user is anonymous
     name = models.CharField(
-        pgettext_lazy("Anonymous reviewer name", "Name"),
-        max_length=255, blank=True)
+        pgettext_lazy("Anonymous reviewer name", "Name"), max_length=255, blank=True
+    )
     email = models.EmailField(_("Email"), blank=True)
     homepage = models.URLField(_("URL"), blank=True)
 
@@ -57,13 +60,16 @@ class AbstractProductReview(models.Model):
     )
 
     status = models.SmallIntegerField(
-        _("Status"), choices=STATUS_CHOICES, default=get_default_review_status)
+        _("Status"), choices=STATUS_CHOICES, default=get_default_review_status
+    )
 
     # Denormalised vote totals
     total_votes = models.IntegerField(
-        _("Total Votes"), default=0)  # upvotes + down votes
+        _("Total Votes"), default=0
+    )  # upvotes + down votes
     delta_votes = models.IntegerField(
-        _("Delta Votes"), default=0, db_index=True)  # upvotes - down votes
+        _("Delta Votes"), default=0, db_index=True
+    )  # upvotes - down votes
 
     date_created = models.DateTimeField(auto_now_add=True)
 
@@ -72,19 +78,19 @@ class AbstractProductReview(models.Model):
 
     class Meta:
         abstract = True
-        app_label = 'reviews'
-        ordering = ['-delta_votes', 'id']
-        unique_together = (('product', 'user'),)
-        verbose_name = _('Product review')
-        verbose_name_plural = _('Product reviews')
+        app_label = "reviews"
+        ordering = ["-delta_votes", "id"]
+        unique_together = (("product", "user"),)
+        verbose_name = _("Product review")
+        verbose_name_plural = _("Product reviews")
 
     def get_absolute_url(self):
         kwargs = {
-            'product_slug': self.product.slug,
-            'product_pk': self.product.id,
-            'pk': self.id
+            "product_slug": self.product.slug,
+            "product_pk": self.product.id,
+            "pk": self.id,
         }
-        return reverse('catalogue:reviews-detail', kwargs=kwargs)
+        return reverse("catalogue:reviews-detail", kwargs=kwargs)
 
     def __str__(self):
         return self.title
@@ -94,7 +100,8 @@ class AbstractProductReview(models.Model):
         self.body = self.body.strip()
         if not self.user and not (self.name and self.email):
             raise ValidationError(
-                _("Anonymous reviews must include a name and an email"))
+                _("Anonymous reviews must include a name and an email")
+            )
 
     def vote_up(self, user):
         self.votes.create(user=user, delta=AbstractVote.UP)
@@ -147,7 +154,7 @@ class AbstractProductReview(models.Model):
     def reviewer_name(self):
         if self.user:
             name = self.user.get_full_name()
-            return name if name else _('anonymous')
+            return name if name else _("anonymous")
         else:
             return self.name
 
@@ -157,10 +164,9 @@ class AbstractProductReview(models.Model):
         """
         Update total and delta votes
         """
-        result = self.votes.aggregate(
-            score=Sum('delta'), total_votes=Count('id'))
-        self.total_votes = result['total_votes'] or 0
-        self.delta_votes = result['score'] or 0
+        result = self.votes.aggregate(score=Sum("delta"), total_votes=Count("id"))
+        self.total_votes = result["total_votes"] or 0
+        self.delta_votes = result["score"] or 0
         self.save()
 
     def can_user_vote(self, user):
@@ -170,6 +176,7 @@ class AbstractProductReview(models.Model):
         """
         if not user.is_authenticated:
             return False, _("Only signed in users can vote")
+        # pylint: disable=no-member
         vote = self.votes.model(review=self, user=user, delta=1)
         try:
             vote.full_clean()
@@ -185,44 +192,37 @@ class AbstractVote(models.Model):
     * Only signed-in users can vote.
     * Each user can vote only once.
     """
+
     review = models.ForeignKey(
-        'reviews.ProductReview',
-        on_delete=models.CASCADE,
-        related_name='votes')
+        "reviews.ProductReview", on_delete=models.CASCADE, related_name="votes"
+    )
     user = models.ForeignKey(
-        AUTH_USER_MODEL,
-        related_name='review_votes',
-        on_delete=models.CASCADE)
-    UP, DOWN = 1, -1
-    VOTE_CHOICES = (
-        (UP, _("Up")),
-        (DOWN, _("Down"))
+        AUTH_USER_MODEL, related_name="review_votes", on_delete=models.CASCADE
     )
-    delta = models.SmallIntegerField(_('Delta'), choices=VOTE_CHOICES)
+    UP, DOWN = 1, -1
+    VOTE_CHOICES = ((UP, _("Up")), (DOWN, _("Down")))
+    delta = models.SmallIntegerField(_("Delta"), choices=VOTE_CHOICES)
     date_created = models.DateTimeField(auto_now_add=True)
 
     class Meta:
         abstract = True
-        app_label = 'reviews'
-        ordering = ['-date_created']
-        unique_together = (('user', 'review'),)
-        verbose_name = _('Vote')
-        verbose_name_plural = _('Votes')
+        app_label = "reviews"
+        ordering = ["-date_created"]
+        unique_together = (("user", "review"),)
+        verbose_name = _("Vote")
+        verbose_name_plural = _("Votes")
 
     def __str__(self):
         return "%s vote for %s" % (self.delta, self.review)
 
     def clean(self):
         if not self.review.is_anonymous and self.review.user == self.user:
-            raise ValidationError(_(
-                "You cannot vote on your own reviews"))
+            raise ValidationError(_("You cannot vote on your own reviews"))
         if not self.user.id:
-            raise ValidationError(_(
-                "Only signed-in users can vote on reviews"))
+            raise ValidationError(_("Only signed-in users can vote on reviews"))
         previous_votes = self.review.votes.filter(user=self.user)
         if len(previous_votes) > 0:
-            raise ValidationError(_(
-                "You can only vote once on a review"))
+            raise ValidationError(_("You can only vote once on a review"))
 
     def save(self, *args, **kwargs):
         super().save(*args, **kwargs)

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

@@ -2,18 +2,25 @@ from django.contrib import admin
 
 from oscar.core.loading import get_model
 
-ProductReview = get_model('reviews', 'ProductReview')
-Vote = get_model('reviews', 'Vote')
+ProductReview = get_model("reviews", "ProductReview")
+Vote = get_model("reviews", "Vote")
 
 
 class ProductReviewAdmin(admin.ModelAdmin):
-    list_display = ('product', 'title', 'score', 'status', 'total_votes',
-                    'delta_votes', 'date_created')
-    readonly_fields = ('total_votes', 'delta_votes')
+    list_display = (
+        "product",
+        "title",
+        "score",
+        "status",
+        "total_votes",
+        "delta_votes",
+        "date_created",
+    )
+    readonly_fields = ("total_votes", "delta_votes")
 
 
 class VoteAdmin(admin.ModelAdmin):
-    list_display = ('review', 'user', 'delta', 'date_created')
+    list_display = ("review", "user", "delta", "date_created")
 
 
 admin.site.register(ProductReview, ProductReviewAdmin)

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

@@ -7,23 +7,28 @@ from oscar.core.loading import get_class
 
 
 class CatalogueReviewsConfig(OscarConfig):
-    label = 'reviews'
-    name = 'oscar.apps.catalogue.reviews'
-    verbose_name = _('Catalogue reviews')
+    label = "reviews"
+    name = "oscar.apps.catalogue.reviews"
+    verbose_name = _("Catalogue reviews")
 
-    hidable_feature_name = 'reviews'
+    hidable_feature_name = "reviews"
 
+    # pylint: disable=attribute-defined-outside-init
     def ready(self):
-        self.detail_view = get_class('catalogue.reviews.views', 'ProductReviewDetail')
-        self.create_view = get_class('catalogue.reviews.views', 'CreateProductReview')
-        self.vote_view = get_class('catalogue.reviews.views', 'AddVoteView')
-        self.list_view = get_class('catalogue.reviews.views', 'ProductReviewList')
+        self.detail_view = get_class("catalogue.reviews.views", "ProductReviewDetail")
+        self.create_view = get_class("catalogue.reviews.views", "CreateProductReview")
+        self.vote_view = get_class("catalogue.reviews.views", "AddVoteView")
+        self.list_view = get_class("catalogue.reviews.views", "ProductReviewList")
 
     def get_urls(self):
         urls = [
-            path('<int:pk>/', self.detail_view.as_view(), name='reviews-detail'),
-            path('add/', self.create_view.as_view(), name='reviews-add'),
-            path('<int:pk>/vote/', login_required(self.vote_view.as_view()), name='reviews-vote'),
-            path('', self.list_view.as_view(), name='reviews-list'),
+            path("<int:pk>/", self.detail_view.as_view(), name="reviews-detail"),
+            path("add/", self.create_view.as_view(), name="reviews-add"),
+            path(
+                "<int:pk>/vote/",
+                login_required(self.vote_view.as_view()),
+                name="reviews-vote",
+            ),
+            path("", self.list_view.as_view(), name="reviews-list"),
         ]
         return self.post_process_urls(urls)

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

@@ -3,32 +3,31 @@ from django.utils.translation import gettext_lazy as _
 
 from oscar.core.loading import get_model
 
-Vote = get_model('reviews', 'vote')
-ProductReview = get_model('reviews', 'productreview')
+Vote = get_model("reviews", "vote")
+ProductReview = get_model("reviews", "productreview")
 
 
 class ProductReviewForm(forms.ModelForm):
-    name = forms.CharField(label=_('Name'), required=True)
-    email = forms.EmailField(label=_('Email'), required=True)
+    name = forms.CharField(label=_("Name"), required=True)
+    email = forms.EmailField(label=_("Email"), required=True)
 
-    def __init__(self, product, user=None, *args, **kwargs):
+    def __init__(self, product, *args, user=None, **kwargs):
         super().__init__(*args, **kwargs)
         self.instance.product = product
         if user and user.is_authenticated:
             self.instance.user = user
-            del self.fields['name']
-            del self.fields['email']
+            del self.fields["name"]
+            del self.fields["email"]
 
     class Meta:
         model = ProductReview
-        fields = ('title', 'score', 'body', 'name', 'email')
+        fields = ("title", "score", "body", "name", "email")
 
 
 class VoteForm(forms.ModelForm):
-
     class Meta:
         model = Vote
-        fields = ('delta',)
+        fields = ("delta",)
 
     def __init__(self, review, user, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -37,24 +36,24 @@ class VoteForm(forms.ModelForm):
 
     @property
     def is_up_vote(self):
-        return self.cleaned_data['delta'] == Vote.UP
+        return self.cleaned_data["delta"] == Vote.UP
 
     @property
     def is_down_vote(self):
-        return self.cleaned_data['delta'] == Vote.DOWN
+        return self.cleaned_data["delta"] == Vote.DOWN
 
 
 class SortReviewsForm(forms.Form):
-    SORT_BY_SCORE = 'score'
-    SORT_BY_RECENCY = 'recency'
+    SORT_BY_SCORE = "score"
+    SORT_BY_RECENCY = "recency"
     SORT_REVIEWS_BY_CHOICES = (
-        (SORT_BY_SCORE, _('Score')),
-        (SORT_BY_RECENCY, _('Recency')),
+        (SORT_BY_SCORE, _("Score")),
+        (SORT_BY_RECENCY, _("Recency")),
     )
 
     sort_by = forms.ChoiceField(
         choices=SORT_REVIEWS_BY_CHOICES,
-        label=_('Sort by'),
+        label=_("Sort by"),
         initial=SORT_BY_SCORE,
-        required=False
+        required=False,
     )

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

@@ -1,12 +1,16 @@
 from oscar.apps.catalogue.reviews.abstract_models import (
-    AbstractProductReview, AbstractVote)
+    AbstractProductReview,
+    AbstractVote,
+)
 from oscar.core.loading import is_model_registered
 
-if not is_model_registered('reviews', 'ProductReview'):
+if not is_model_registered("reviews", "ProductReview"):
+
     class ProductReview(AbstractProductReview):
         pass
 
 
-if not is_model_registered('reviews', 'Vote'):
+if not is_model_registered("reviews", "Vote"):
+
     class Vote(AbstractVote):
         pass

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

@@ -4,7 +4,7 @@ from oscar.core.loading import get_model
 
 
 def get_default_review_status():
-    ProductReview = get_model('reviews', 'ProductReview')
+    ProductReview = get_model("reviews", "ProductReview")
 
     if settings.OSCAR_MODERATE_REVIEWS:
         return ProductReview.FOR_MODERATION

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

@@ -9,12 +9,12 @@ 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',
-    ['ProductReviewForm', 'VoteForm', 'SortReviewsForm'])
+    "catalogue.reviews.forms", ["ProductReviewForm", "VoteForm", "SortReviewsForm"]
+)
 
-Vote = get_model('reviews', 'vote')
-ProductReview = get_model('reviews', 'ProductReview')
-Product = get_model('catalogue', 'product')
+Vote = get_model("reviews", "vote")
+ProductReview = get_model("reviews", "ProductReview")
+Product = get_model("catalogue", "product")
 
 
 class CreateProductReview(CreateView):
@@ -25,8 +25,10 @@ class CreateProductReview(CreateView):
     view_signal = review_added
 
     def dispatch(self, request, *args, **kwargs):
+        # pylint: disable=attribute-defined-outside-init
         self.product = get_object_or_404(
-            self.product_model, pk=kwargs['product_pk'], is_public=True)
+            self.product_model, pk=kwargs["product_pk"], is_public=True
+        )
         # check permission to leave review
         if not self.product.is_review_permitted(request.user):
             if self.product.has_review_by(request.user):
@@ -36,18 +38,17 @@ class CreateProductReview(CreateView):
             messages.warning(self.request, message)
             return redirect(self.product.get_absolute_url())
 
-        return super().dispatch(
-            request, *args, **kwargs)
+        return super().dispatch(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['product'] = self.product
+        context["product"] = self.product
         return context
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['product'] = self.product
-        kwargs['user'] = self.request.user
+        kwargs["product"] = self.product
+        kwargs["user"] = self.request.user
         return kwargs
 
     def form_valid(self, form):
@@ -56,24 +57,29 @@ class CreateProductReview(CreateView):
         return response
 
     def get_success_url(self):
-        messages.success(
-            self.request, _("Thank you for reviewing this product"))
+        messages.success(self.request, _("Thank you for reviewing this product"))
         return self.product.get_absolute_url()
 
     def send_signal(self, request, response, review):
-        self.view_signal.send(sender=self, review=review, user=request.user,
-                              request=request, response=response)
+        self.view_signal.send(
+            sender=self,
+            review=review,
+            user=request.user,
+            request=request,
+            response=response,
+        )
 
 
 class ProductReviewDetail(DetailView):
     template_name = "oscar/catalogue/reviews/review_detail.html"
-    context_object_name = 'review'
+    context_object_name = "review"
     model = ProductReview
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['product'] = get_object_or_404(
-            Product, pk=self.kwargs['product_pk'], is_public=True)
+        context["product"] = get_object_or_404(
+            Product, pk=self.kwargs["product_pk"], is_public=True
+        )
         return context
 
 
@@ -86,8 +92,10 @@ class AddVoteView(View):
     """
 
     def post(self, request, *args, **kwargs):
-        product = get_object_or_404(Product, pk=self.kwargs['product_pk'], is_public=True)
-        review = get_object_or_404(ProductReview, pk=self.kwargs['pk'])
+        product = get_object_or_404(
+            Product, pk=self.kwargs["product_pk"], is_public=True
+        )
+        review = get_object_or_404(ProductReview, pk=self.kwargs["pk"])
 
         form = VoteForm(review, request.user, request.POST)
         if form.is_valid():
@@ -107,24 +115,27 @@ class ProductReviewList(ListView):
     """
     Browse reviews for a product
     """
-    template_name = 'oscar/catalogue/reviews/review_list.html'
+
+    template_name = "oscar/catalogue/reviews/review_list.html"
     context_object_name = "reviews"
     model = ProductReview
     product_model = Product
     paginate_by = settings.OSCAR_REVIEWS_PER_PAGE
 
     def get_queryset(self):
-        qs = self.model.objects.approved().filter(product=self.kwargs['product_pk'])
+        qs = self.model.objects.approved().filter(product=self.kwargs["product_pk"])
+        # pylint: disable=attribute-defined-outside-init
         self.form = SortReviewsForm(self.request.GET)
         if self.request.GET and self.form.is_valid():
-            sort_by = self.form.cleaned_data['sort_by']
+            sort_by = self.form.cleaned_data["sort_by"]
             if sort_by == SortReviewsForm.SORT_BY_RECENCY:
-                return qs.order_by('-date_created')
-        return qs.order_by('-score')
+                return qs.order_by("-date_created")
+        return qs.order_by("-score")
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['product'] = get_object_or_404(
-            self.product_model, pk=self.kwargs['product_pk'], is_public=True)
-        context['form'] = self.form
+        context["product"] = get_object_or_404(
+            self.product_model, pk=self.kwargs["product_pk"], is_public=True
+        )
+        context["form"] = self.form
         return context

src/oscar/apps/catalogue/search_handlers.py

@@ -4,12 +4,13 @@ from django.views.generic.list import MultipleObjectMixin
 
 from oscar.core.loading import get_class, get_classes, get_model
 
-BrowseCategoryForm = get_class('search.forms', 'BrowseCategoryForm')
+BrowseCategoryForm = get_class("search.forms", "BrowseCategoryForm")
 SearchHandler, SearchResultsPaginationMixin = get_classes(
-    'search.search_handlers', ('SearchHandler', 'SearchResultsPaginationMixin'))
-is_solr_supported = get_class('search.features', 'is_solr_supported')
-is_elasticsearch_supported = get_class('search.features', 'is_elasticsearch_supported')
-Product = get_model('catalogue', 'Product')
+    "search.search_handlers", ("SearchHandler", "SearchResultsPaginationMixin")
+)
+is_solr_supported = get_class("search.features", "is_solr_supported")
+is_elasticsearch_supported = get_class("search.features", "is_elasticsearch_supported")
+Product = get_model("catalogue", "Product")
 
 
 def get_product_search_handler_class():
@@ -23,14 +24,14 @@ def get_product_search_handler_class():
     if settings.OSCAR_PRODUCT_SEARCH_HANDLER is not None:
         return import_string(settings.OSCAR_PRODUCT_SEARCH_HANDLER)
     if is_solr_supported():
-        return get_class('catalogue.search_handlers', 'SolrProductSearchHandler')
+        return get_class("catalogue.search_handlers", "SolrProductSearchHandler")
     elif is_elasticsearch_supported():
         return get_class(
-            'catalogue.search_handlers', 'ESProductSearchHandler',
+            "catalogue.search_handlers",
+            "ESProductSearchHandler",
         )
     else:
-        return get_class(
-            'catalogue.search_handlers', 'SimpleProductSearchHandler')
+        return get_class("catalogue.search_handlers", "SimpleProductSearchHandler")
 
 
 class SolrProductSearchHandler(SearchHandler):
@@ -38,6 +39,7 @@ class SolrProductSearchHandler(SearchHandler):
     Search handler specialised for searching products.  Comes with optional
     category filtering. To be used with a Solr search backend.
     """
+
     form_class = BrowseCategoryForm
     model_whitelist = [Product]
     paginate_by = settings.OSCAR_PRODUCTS_PER_PAGE
@@ -51,9 +53,10 @@ class SolrProductSearchHandler(SearchHandler):
         if self.categories:
             # We use 'narrow' API to ensure Solr's 'fq' filtering is used as
             # opposed to filtering using 'q'.
-            pattern = ' OR '.join([
-                '"%s"' % sqs.query.clean(c.full_name) for c in self.categories])
-            sqs = sqs.narrow('category_exact:(%s)' % pattern)
+            pattern = " OR ".join(
+                ['"%s"' % sqs.query.clean(c.full_name) for c in self.categories]
+            )
+            sqs = sqs.narrow("category_exact:(%s)" % pattern)
         return sqs
 
 
@@ -62,6 +65,7 @@ class ESProductSearchHandler(SearchHandler):
     Search handler specialised for searching products.  Comes with optional
     category filtering. To be used with an ElasticSearch search backend.
     """
+
     form_class = BrowseCategoryForm
     model_whitelist = [Product]
     paginate_by = settings.OSCAR_PRODUCTS_PER_PAGE
@@ -87,12 +91,14 @@ class SimpleProductSearchHandler(SearchResultsPaginationMixin, MultipleObjectMix
     Note that is meant as a replacement search handler and not as a view
     mixin; the mixin just does most of what we need it to do.
     """
+
     paginate_by = settings.OSCAR_PRODUCTS_PER_PAGE
 
+    # pylint: disable=unused-argument
     def __init__(self, request_data, full_path, categories=None):
         self.request_data = request_data
         self.categories = categories
-        self.kwargs = {'page': request_data.get('page') or 1}
+        self.kwargs = {"page": request_data.get("page") or 1}
         self.object_list = self.get_queryset()
 
     def get_queryset(self):
@@ -106,5 +112,5 @@ class SimpleProductSearchHandler(SearchResultsPaginationMixin, MultipleObjectMix
         # internally by MultipleObjectMixin
         self.context_object_name = context_object_name
         context = self.get_context_data(object_list=self.object_list)
-        context[context_object_name] = context['page_obj'].object_list
+        context[context_object_name] = context["page_obj"].object_list
         return context

src/oscar/apps/catalogue/utils.py

@@ -12,66 +12,68 @@ from django.utils.translation import gettext_lazy as _
 from PIL import Image
 
 from oscar.apps.catalogue.exceptions import (
-    IdenticalImageError, ImageImportError, InvalidImageArchive)
+    IdenticalImageError,
+    ImageImportError,
+    InvalidImageArchive,
+)
 from oscar.core.loading import get_model
 
-Product = get_model('catalogue', 'product')
-ProductImage = get_model('catalogue', 'productimage')
+Product = get_model("catalogue", "product")
+ProductImage = get_model("catalogue", "productimage")
 
 
 # This is an old class only really intended to be used by the internal sandbox
 # site. It's not recommended to be used by your project.
 class Importer(object):
-
-    allowed_extensions = ['.jpeg', '.jpg', '.gif', '.png']
+    allowed_extensions = [".jpeg", ".jpg", ".gif", ".png"]
 
     def __init__(self, logger, field):
         self.logger = logger
         self._field = field
 
-    @atomic  # noqa (too complex (10))
+    @atomic
     def handle(self, dirname):
-        stats = {
-            'num_processed': 0,
-            'num_skipped': 0,
-            'num_invalid': 0}
+        stats = {"num_processed": 0, "num_skipped": 0, "num_invalid": 0}
         image_dir, filenames = self._get_image_files(dirname)
         if image_dir:
             for filename in filenames:
                 try:
-                    lookup_value \
-                        = self._get_lookup_value_from_filename(filename)
+                    lookup_value = self._get_lookup_value_from_filename(filename)
                     self._process_image(image_dir, filename, lookup_value)
-                    stats['num_processed'] += 1
+                    stats["num_processed"] += 1
                 except Product.MultipleObjectsReturned:
-                    self.logger.warning("Multiple products matching %s='%s',"
-                                        " skipping"
-                                        % (self._field, lookup_value))
-                    stats['num_skipped'] += 1
+                    self.logger.warning(
+                        "Multiple products matching %s='%s',"
+                        " skipping" % (self._field, lookup_value)
+                    )
+                    stats["num_skipped"] += 1
                 except Product.DoesNotExist:
-                    self.logger.warning("No item matching %s='%s'"
-                                        % (self._field, lookup_value))
-                    stats['num_skipped'] += 1
+                    self.logger.warning(
+                        "No item matching %s='%s'" % (self._field, lookup_value)
+                    )
+                    stats["num_skipped"] += 1
                 except IdenticalImageError:
-                    self.logger.warning("Identical image already exists for"
-                                        " %s='%s', skipping"
-                                        % (self._field, lookup_value))
-                    stats['num_skipped'] += 1
+                    self.logger.warning(
+                        "Identical image already exists for"
+                        " %s='%s', skipping" % (self._field, lookup_value)
+                    )
+                    stats["num_skipped"] += 1
                 except IOError as e:
-                    stats['num_invalid'] += 1
-                    raise ImageImportError(_('%(filename)s is not a valid'
-                                             ' image (%(error)s)')
-                                           % {'filename': filename,
-                                              'error': e})
+                    stats["num_invalid"] += 1
+                    raise ImageImportError(
+                        _("%(filename)s is not a valid image (%(error)s)")
+                        % {"filename": filename, "error": e}
+                    )
                 except FieldError as e:
                     raise ImageImportError(e)
             if image_dir != dirname:
                 shutil.rmtree(image_dir)
         else:
-            raise InvalidImageArchive(_('%s is not a valid image archive')
-                                      % dirname)
-        self.logger.info("Finished image import: %(num_processed)d imported,"
-                         " %(num_skipped)d skipped" % stats)
+            raise InvalidImageArchive(_("%s is not a valid image archive") % dirname)
+        self.logger.info(
+            "Finished image import: %(num_processed)d imported,"
+            " %(num_skipped)d skipped" % stats
+        )
 
     def _get_image_files(self, dirname):
         filenames = []
@@ -79,24 +81,26 @@ class Importer(object):
         if image_dir:
             for filename in os.listdir(image_dir):
                 ext = os.path.splitext(filename)[1]
-                if os.path.isfile(os.path.join(image_dir, filename)) \
-                        and ext in self.allowed_extensions:
+                if (
+                    os.path.isfile(os.path.join(image_dir, filename))
+                    and ext in self.allowed_extensions
+                ):
                     filenames.append(filename)
         return image_dir, filenames
 
     def _extract_images(self, dirname):
-        '''
+        """
         Returns path to directory containing images in dirname if successful.
         Returns empty string if dirname does not exist, or could not be opened.
         Assumes that if dirname is a directory, then it contains images.
         If dirname is an archive (tar/zip file) then the path returned is to a
         temporary directory that should be deleted when no longer required.
-        '''
+        """
         if os.path.isdir(dirname):
             return dirname
 
         ext = os.path.splitext(dirname)[1]
-        if ext in ['.gz', '.tar']:
+        if ext in [".gz", ".tar"]:
             image_dir = tempfile.mkdtemp()
             try:
                 tar_file = tarfile.open(dirname)
@@ -105,7 +109,7 @@ class Importer(object):
                 return image_dir
             except (tarfile.TarError, zlib.error):
                 return ""
-        elif ext == '.zip':
+        elif ext == ".zip":
             image_dir = tempfile.mkdtemp()
             try:
                 zip_file = zipfile.ZipFile(dirname)
@@ -125,7 +129,7 @@ class Importer(object):
         kwargs = {self._field: lookup_value}
         item = Product._default_manager.get(**kwargs)
 
-        new_data = open(file_path, 'rb').read()
+        new_data = open(file_path, "rb").read()
         next_index = 0
         for existing in item.images.all():
             next_index = existing.display_order + 1
@@ -136,7 +140,7 @@ class Importer(object):
                 # File probably doesn't exist
                 existing.delete()
 
-        new_file = File(open(file_path, 'rb'))
+        new_file = File(open(file_path, "rb"))
         im = ProductImage(product=item, display_order=next_index)
         im.original.save(filename, new_file, save=False)
         im.save()

src/oscar/apps/catalogue/views.py

@@ -10,16 +10,17 @@ from django.views.generic import DetailView, TemplateView
 from oscar.apps.catalogue.signals import product_viewed
 from oscar.core.loading import get_class, get_model
 
-Product = get_model('catalogue', 'product')
-Category = get_model('catalogue', 'category')
-ProductAlert = get_model('customer', 'ProductAlert')
-ProductAlertForm = get_class('customer.forms', 'ProductAlertForm')
+Product = get_model("catalogue", "product")
+Category = get_model("catalogue", "category")
+ProductAlert = get_model("customer", "ProductAlert")
+ProductAlertForm = get_class("customer.forms", "ProductAlertForm")
 get_product_search_handler_class = get_class(
-    'catalogue.search_handlers', 'get_product_search_handler_class')
+    "catalogue.search_handlers", "get_product_search_handler_class"
+)
 
 
 class ProductDetailView(DetailView):
-    context_object_name = 'product'
+    context_object_name = "product"
     model = Product
     view_signal = product_viewed
     template_folder = "catalogue"
@@ -32,21 +33,21 @@ class ProductDetailView(DetailView):
     # displayed on parent product page.
     enforce_parent = False
 
-    def get(self, request, **kwargs):
+    def get(self, request, *args, **kwargs):
         """
         Ensures that the correct URL is used before rendering a response
         """
+        # pylint: disable=attribute-defined-outside-init
         self.object = product = self.get_object()
 
-        redirect = self.redirect_if_necessary(request.path, product)
-        if redirect is not None:
-            return redirect
+        if redirect_to := self.redirect_if_necessary(request.path, product):
+            return redirect_to
 
         # Do allow staff members so they can test layout etc.
         if not self.is_viewable(product, request):
             raise Http404()
 
-        response = super().get(request, **kwargs)
+        response = super().get(request, *args, **kwargs)
         self.send_signal(request, response, product)
         return response
 
@@ -55,15 +56,14 @@ class ProductDetailView(DetailView):
 
     def get_object(self, queryset=None):
         # Check if self.object is already set to prevent unnecessary DB calls
-        if hasattr(self, 'object'):
+        if hasattr(self, "object"):
             return self.object
         else:
             return super().get_object(queryset)
 
     def redirect_if_necessary(self, current_path, product):
         if self.enforce_parent and product.is_child:
-            return HttpResponsePermanentRedirect(
-                product.parent.get_absolute_url())
+            return HttpResponsePermanentRedirect(product.parent.get_absolute_url())
 
         if self.enforce_paths:
             expected_path = product.get_absolute_url()
@@ -72,8 +72,8 @@ class ProductDetailView(DetailView):
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
-        ctx['alert_form'] = self.get_alert_form()
-        ctx['has_active_alert'] = self.get_alert_status()
+        ctx["alert_form"] = self.get_alert_form()
+        ctx["has_active_alert"] = self.get_alert_status()
         return ctx
 
     def get_alert_status(self):
@@ -81,19 +81,22 @@ class ProductDetailView(DetailView):
         has_alert = False
         if self.request.user.is_authenticated:
             alerts = ProductAlert.objects.filter(
-                product=self.object, user=self.request.user,
-                status=ProductAlert.ACTIVE)
+                product=self.object, user=self.request.user, status=ProductAlert.ACTIVE
+            )
             has_alert = alerts.exists()
         return has_alert
 
     def get_alert_form(self):
-        return ProductAlertForm(
-            user=self.request.user, product=self.object)
+        return ProductAlertForm(user=self.request.user, product=self.object)
 
     def send_signal(self, request, response, product):
         self.view_signal.send(
-            sender=self, product=product, user=request.user, request=request,
-            response=response)
+            sender=self,
+            product=product,
+            user=request.user,
+            request=request,
+            response=response,
+        )
 
     def get_template_names(self):
         """
@@ -112,29 +115,32 @@ class ProductDetailView(DetailView):
             return [self.template_name]
 
         return [
-            'oscar/%s/detail-for-upc-%s.html' % (
-                self.template_folder, self.object.upc),
-            'oscar/%s/detail-for-class-%s.html' % (
-                self.template_folder, self.object.get_product_class().slug),
-            'oscar/%s/detail.html' % self.template_folder]
+            "oscar/%s/detail-for-upc-%s.html" % (self.template_folder, self.object.upc),
+            "oscar/%s/detail-for-class-%s.html"
+            % (self.template_folder, self.object.get_product_class().slug),
+            "oscar/%s/detail.html" % self.template_folder,
+        ]
 
 
 class CatalogueView(TemplateView):
     """
     Browse all products in the catalogue
     """
+
     context_object_name = "products"
-    template_name = 'oscar/catalogue/browse.html'
+    template_name = "oscar/catalogue/browse.html"
 
     def get(self, request, *args, **kwargs):
         try:
+            # pylint: disable=attribute-defined-outside-init
             self.search_handler = self.get_search_handler(
-                self.request.GET, request.get_full_path(), [])
+                self.request.GET, request.get_full_path(), []
+            )
             response = super().get(request, *args, **kwargs)
         except InvalidPage:
             # Redirect to page one.
-            messages.error(request, _('The given page number was invalid.'))
-            return redirect('catalogue:index')
+            messages.error(request, _("The given page number was invalid."))
+            return redirect("catalogue:index")
         return response
 
     def get_search_handler(self, *args, **kwargs):
@@ -142,9 +148,10 @@ class CatalogueView(TemplateView):
 
     def get_context_data(self, **kwargs):
         ctx = {}
-        ctx['summary'] = _("All products")
+        ctx["summary"] = _("All products")
         search_context = self.search_handler.get_search_context_data(
-            self.context_object_name)
+            self.context_object_name
+        )
         ctx.update(search_context)
         return ctx
 
@@ -153,29 +160,32 @@ class ProductCategoryView(TemplateView):
     """
     Browse products in a given category
     """
+
     context_object_name = "products"
-    template_name = 'oscar/catalogue/category.html'
+    template_name = "oscar/catalogue/category.html"
     enforce_paths = True
 
     def get(self, request, *args, **kwargs):
         # Fetch the category; return 404 or redirect as needed
+        # pylint: disable=attribute-defined-outside-init
         self.category = self.get_category()
 
         # Allow staff members so they can test layout etc.
         if not self.is_viewable(self.category, request):
             raise Http404()
 
-        potential_redirect = self.redirect_if_necessary(
-            request.path, self.category)
+        potential_redirect = self.redirect_if_necessary(request.path, self.category)
         if potential_redirect is not None:
             return potential_redirect
 
         try:
+            # pylint: disable=attribute-defined-outside-init
             self.search_handler = self.get_search_handler(
-                request.GET, request.get_full_path(), self.get_categories())
+                request.GET, request.get_full_path(), self.get_categories()
+            )
             response = super().get(request, *args, **kwargs)
         except InvalidPage:
-            messages.error(request, _('The given page number was invalid.'))
+            messages.error(request, _("The given page number was invalid."))
             return redirect(self.category.get_absolute_url())
 
         return response
@@ -184,7 +194,7 @@ class ProductCategoryView(TemplateView):
         return category.is_public or request.user.is_staff
 
     def get_category(self):
-        return get_object_or_404(Category, pk=self.kwargs['pk'])
+        return get_object_or_404(Category, pk=self.kwargs["pk"])
 
     def redirect_if_necessary(self, current_path, category):
         if self.enforce_paths:
@@ -205,8 +215,9 @@ class ProductCategoryView(TemplateView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['category'] = self.category
+        context["category"] = self.category
         search_context = self.search_handler.get_search_context_data(
-            self.context_object_name)
+            self.context_object_name
+        )
         context.update(search_context)
         return context

src/oscar/apps/checkout/__init__.py

@@ -1 +1 @@
-default_app_config = 'oscar.apps.checkout.apps.CheckoutConfig'
+default_app_config = "oscar.apps.checkout.apps.CheckoutConfig"

src/oscar/apps/checkout/applicator.py

@@ -4,7 +4,7 @@ class SurchargeList(list):
         return sum([surcharge.price for surcharge in self])
 
 
-class SurchargePrice():
+class SurchargePrice:
     surcharge = None
     price = None
 
@@ -13,12 +13,12 @@ class SurchargePrice():
         self.price = price
 
 
-class SurchargeApplicator():
-
+class SurchargeApplicator:
     def __init__(self, request=None, context=None):
         self.context = context
         self.request = request
 
+    # pylint: disable=unused-argument
     def get_surcharges(self, basket, **kwargs):
         """
         For example::
@@ -35,10 +35,7 @@ class SurchargeApplicator():
 
     def get_applicable_surcharges(self, basket, **kwargs):
         methods = [
-            SurchargePrice(
-                surcharge,
-                surcharge.calculate(basket=basket, **kwargs)
-            )
+            SurchargePrice(surcharge, surcharge.calculate(basket=basket, **kwargs))
             for surcharge in self.get_surcharges(basket=basket, **kwargs)
             if self.is_applicable(surcharge=surcharge, basket=basket, **kwargs)
         ]
@@ -48,6 +45,7 @@ class SurchargeApplicator():
         else:
             return None
 
+    # pylint: disable=unused-argument
     def is_applicable(self, surcharge, basket, **kwargs):
         """
         Checks if surcharge is applicable to certain conditions

src/oscar/apps/checkout/apps.py

@@ -8,49 +8,76 @@ from oscar.core.loading import get_class
 
 
 class CheckoutConfig(OscarConfig):
-    label = 'checkout'
-    name = 'oscar.apps.checkout'
-    verbose_name = _('Checkout')
+    label = "checkout"
+    name = "oscar.apps.checkout"
+    verbose_name = _("Checkout")
 
-    namespace = 'checkout'
+    namespace = "checkout"
 
+    # pylint: disable=attribute-defined-outside-init
     def ready(self):
-        self.index_view = get_class('checkout.views', 'IndexView')
-        self.shipping_address_view = get_class('checkout.views', 'ShippingAddressView')
-        self.user_address_update_view = get_class('checkout.views',
-                                                  'UserAddressUpdateView')
-        self.user_address_delete_view = get_class('checkout.views',
-                                                  'UserAddressDeleteView')
-        self.shipping_method_view = get_class('checkout.views', 'ShippingMethodView')
-        self.payment_method_view = get_class('checkout.views', 'PaymentMethodView')
-        self.payment_details_view = get_class('checkout.views', 'PaymentDetailsView')
-        self.thankyou_view = get_class('checkout.views', 'ThankYouView')
+        self.index_view = get_class("checkout.views", "IndexView")
+        self.shipping_address_view = get_class("checkout.views", "ShippingAddressView")
+        self.user_address_update_view = get_class(
+            "checkout.views", "UserAddressUpdateView"
+        )
+        self.user_address_delete_view = get_class(
+            "checkout.views", "UserAddressDeleteView"
+        )
+        self.shipping_method_view = get_class("checkout.views", "ShippingMethodView")
+        self.payment_method_view = get_class("checkout.views", "PaymentMethodView")
+        self.payment_details_view = get_class("checkout.views", "PaymentDetailsView")
+        self.thankyou_view = get_class("checkout.views", "ThankYouView")
 
     def get_urls(self):
         urls = [
-            path('', self.index_view.as_view(), name='index'),
-
+            path("", self.index_view.as_view(), name="index"),
             # Shipping/user address views
-            path('shipping-address/', self.shipping_address_view.as_view(), name='shipping-address'),
-            path('user-address/edit/<int:pk>/', self.user_address_update_view.as_view(), name='user-address-update'),
-            path('user-address/delete/<int:pk>/', self.user_address_delete_view.as_view(), name='user-address-delete'),
-
+            path(
+                "shipping-address/",
+                self.shipping_address_view.as_view(),
+                name="shipping-address",
+            ),
+            path(
+                "user-address/edit/<int:pk>/",
+                self.user_address_update_view.as_view(),
+                name="user-address-update",
+            ),
+            path(
+                "user-address/delete/<int:pk>/",
+                self.user_address_delete_view.as_view(),
+                name="user-address-delete",
+            ),
             # Shipping method views
-            path('shipping-method/', self.shipping_method_view.as_view(), name='shipping-method'),
-
+            path(
+                "shipping-method/",
+                self.shipping_method_view.as_view(),
+                name="shipping-method",
+            ),
             # Payment views
-            path('payment-method/', self.payment_method_view.as_view(), name='payment-method'),
-            path('payment-details/', self.payment_details_view.as_view(), name='payment-details'),
-
+            path(
+                "payment-method/",
+                self.payment_method_view.as_view(),
+                name="payment-method",
+            ),
+            path(
+                "payment-details/",
+                self.payment_details_view.as_view(),
+                name="payment-details",
+            ),
             # Preview and thankyou
-            path('preview/', self.payment_details_view.as_view(preview=True), name='preview'),
-            path('thank-you/', self.thankyou_view.as_view(), name='thank-you'),
+            path(
+                "preview/",
+                self.payment_details_view.as_view(preview=True),
+                name="preview",
+            ),
+            path("thank-you/", self.thankyou_view.as_view(), name="thank-you"),
         ]
         return self.post_process_urls(urls)
 
     def get_url_decorator(self, pattern):
         if not settings.OSCAR_ALLOW_ANON_CHECKOUT:
             return login_required
-        if pattern.name.startswith('user-address'):
+        if pattern.name.startswith("user-address"):
             return login_required
         return None

src/oscar/apps/checkout/calculators.py

@@ -26,5 +26,5 @@ class OrderTotalCalculator(object):
                 incl_tax += surcharges.total.incl_tax
 
         return prices.Price(
-            currency=basket.currency,
-            excl_tax=excl_tax, incl_tax=incl_tax)
+            currency=basket.currency, excl_tax=excl_tax, incl_tax=incl_tax
+        )

src/oscar/apps/checkout/context_processors.py

@@ -2,6 +2,5 @@ from django.conf import settings
 
 
 def checkout(request):
-    anon_checkout_allowed \
-        = getattr(settings, 'OSCAR_ALLOW_ANON_CHECKOUT', False)
-    return {'anon_checkout_allowed': anon_checkout_allowed}
+    anon_checkout_allowed = getattr(settings, "OSCAR_ALLOW_ANON_CHECKOUT", False)
+    return {"anon_checkout_allowed": anon_checkout_allowed}

src/oscar/apps/checkout/exceptions.py

@@ -1,5 +1,4 @@
 class FailedPreCondition(Exception):
-
     def __init__(self, url, message=None, messages=None):
         self.url = url
         if message:
@@ -15,5 +14,6 @@ class PassedSkipCondition(Exception):
     To be raised when a skip condition has been passed and the current view
     should be skipped. The passed URL dictates where to.
     """
+
     def __init__(self, url):
         self.url = url

src/oscar/apps/checkout/forms.py

@@ -8,35 +8,40 @@ from oscar.core.loading import get_class, get_model
 from oscar.forms.mixins import PhoneNumberMixin
 
 User = get_user_model()
-AbstractAddressForm = get_class('address.forms', 'AbstractAddressForm')
-Country = get_model('address', 'Country')
+AbstractAddressForm = get_class("address.forms", "AbstractAddressForm")
+Country = get_model("address", "Country")
 
 
 class ShippingAddressForm(PhoneNumberMixin, AbstractAddressForm):
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.adjust_country_field()
 
     def adjust_country_field(self):
-        countries = Country._default_manager.filter(
-            is_shipping_country=True)
+        countries = Country._default_manager.filter(is_shipping_country=True)
 
         # No need to show country dropdown if there is only one option
         if len(countries) == 1:
-            self.fields.pop('country', None)
+            self.fields.pop("country", None)
             self.instance.country = countries[0]
         else:
-            self.fields['country'].queryset = countries
-            self.fields['country'].empty_label = None
+            self.fields["country"].queryset = countries
+            self.fields["country"].empty_label = None
 
     class Meta:
-        model = get_model('order', 'shippingaddress')
+        model = get_model("order", "shippingaddress")
         fields = [
-            'first_name', 'last_name',
-            'line1', 'line2', 'line3', 'line4',
-            'state', 'postcode', 'country',
-            'phone_number', 'notes',
+            "first_name",
+            "last_name",
+            "line1",
+            "line2",
+            "line3",
+            "line4",
+            "state",
+            "postcode",
+            "country",
+            "phone_number",
+            "notes",
         ]
 
 
@@ -44,31 +49,38 @@ class ShippingMethodForm(forms.Form):
     method_code = forms.ChoiceField(widget=forms.HiddenInput)
 
     def __init__(self, *args, **kwargs):
-        methods = kwargs.pop('methods', [])
+        methods = kwargs.pop("methods", [])
         super().__init__(*args, **kwargs)
-        self.fields['method_code'].choices = ((m.code, m.name) for m in methods)
+        self.fields["method_code"].choices = ((m.code, m.name) for m in methods)
 
 
 class GatewayForm(AuthenticationForm):
     username = forms.EmailField(label=_("My email address is"))
-    GUEST, NEW, EXISTING = 'anonymous', 'new', 'existing'
+    GUEST, NEW, EXISTING = "anonymous", "new", "existing"
     CHOICES = (
-        (GUEST, _('I am a new customer and want to checkout as a guest')),
-        (NEW, _('I am a new customer and want to create an account '
-                'before checking out')),
-        (EXISTING, _('I am a returning customer, and my password is')))
-    options = forms.ChoiceField(widget=forms.widgets.RadioSelect,
-                                choices=CHOICES, initial=GUEST)
+        (GUEST, _("I am a new customer and want to checkout as a guest")),
+        (
+            NEW,
+            _(
+                "I am a new customer and want to create an account "
+                "before checking out"
+            ),
+        ),
+        (EXISTING, _("I am a returning customer, and my password is")),
+    )
+    options = forms.ChoiceField(
+        widget=forms.widgets.RadioSelect, choices=CHOICES, initial=GUEST
+    )
 
     def clean_username(self):
-        return normalise_email(self.cleaned_data['username'])
+        return normalise_email(self.cleaned_data["username"])
 
     def clean(self):
         if self.is_guest_checkout() or self.is_new_account_checkout():
-            if 'password' in self.errors:
-                del self.errors['password']
-            if 'username' in self.cleaned_data:
-                email = normalise_email(self.cleaned_data['username'])
+            if "password" in self.errors:
+                del self.errors["password"]
+            if "username" in self.cleaned_data:
+                email = normalise_email(self.cleaned_data["username"])
                 if User._default_manager.filter(email__iexact=email).exists():
                     msg = _("A user with that email address already exists")
                     self._errors["username"] = self.error_class([msg])
@@ -76,10 +88,10 @@ class GatewayForm(AuthenticationForm):
         return super().clean()
 
     def is_guest_checkout(self):
-        return self.cleaned_data.get('options', None) == self.GUEST
+        return self.cleaned_data.get("options", None) == self.GUEST
 
     def is_new_account_checkout(self):
-        return self.cleaned_data.get('options', None) == self.NEW
+        return self.cleaned_data.get("options", None) == self.NEW
 
 
 # The BillingAddress form is in oscar.apps.payment.forms

src/oscar/apps/checkout/mixins.py

@@ -8,20 +8,20 @@ from django.urls import NoReverseMatch, reverse
 from oscar.apps.checkout.signals import post_checkout
 from oscar.core.loading import get_class, get_model
 
-OrderCreator = get_class('order.utils', 'OrderCreator')
-OrderDispatcher = get_class('order.utils', 'OrderDispatcher')
-CheckoutSessionMixin = get_class('checkout.session', 'CheckoutSessionMixin')
-BillingAddress = get_model('order', 'BillingAddress')
-ShippingAddress = get_model('order', 'ShippingAddress')
-OrderNumberGenerator = get_class('order.utils', 'OrderNumberGenerator')
-PaymentEventType = get_model('order', 'PaymentEventType')
-PaymentEvent = get_model('order', 'PaymentEvent')
-PaymentEventQuantity = get_model('order', 'PaymentEventQuantity')
-UserAddress = get_model('address', 'UserAddress')
-Basket = get_model('basket', 'Basket')
+OrderCreator = get_class("order.utils", "OrderCreator")
+OrderDispatcher = get_class("order.utils", "OrderDispatcher")
+CheckoutSessionMixin = get_class("checkout.session", "CheckoutSessionMixin")
+BillingAddress = get_model("order", "BillingAddress")
+ShippingAddress = get_model("order", "ShippingAddress")
+OrderNumberGenerator = get_class("order.utils", "OrderNumberGenerator")
+PaymentEventType = get_model("order", "PaymentEventType")
+PaymentEvent = get_model("order", "PaymentEvent")
+PaymentEventQuantity = get_model("order", "PaymentEventQuantity")
+UserAddress = get_model("address", "UserAddress")
+Basket = get_model("basket", "Basket")
 
 # Standard logger for checkout events
-logger = logging.getLogger('oscar.checkout')
+logger = logging.getLogger("oscar.checkout")
 
 
 class OrderPlacementMixin(CheckoutSessionMixin):
@@ -30,6 +30,7 @@ class OrderPlacementMixin(CheckoutSessionMixin):
 
     Any view class which needs to place an order should use this mixin.
     """
+
     # Any payment sources should be added to this list as part of the
     # handle_payment method.  If the order is placed successfully, then
     # they will be persisted. We need to have the order instance before the
@@ -57,7 +58,6 @@ class OrderPlacementMixin(CheckoutSessionMixin):
         events (using add_payment_event) so they can be
         linked to the order when it is saved later on.
         """
-        pass
 
     def add_payment_source(self, source):
         """
@@ -67,18 +67,15 @@ class OrderPlacementMixin(CheckoutSessionMixin):
             self._payment_sources = []
         self._payment_sources.append(source)
 
-    def add_payment_event(self, event_type_name, amount, reference=''):
+    def add_payment_event(self, event_type_name, amount, reference=""):
         """
         Record a payment event for creation once the order is placed
         """
-        event_type, __ = PaymentEventType.objects.get_or_create(
-            name=event_type_name)
+        event_type, __ = PaymentEventType.objects.get_or_create(name=event_type_name)
         # We keep a local cache of (unsaved) payment events
         if self._payment_events is None:
             self._payment_events = []
-        event = PaymentEvent(
-            event_type=event_type, amount=amount,
-            reference=reference)
+        event = PaymentEvent(event_type=event_type, amount=amount, reference=reference)
         self._payment_events.append(event)
 
     # Placing order methods
@@ -90,10 +87,19 @@ class OrderPlacementMixin(CheckoutSessionMixin):
         """
         return OrderNumberGenerator().order_number(basket)
 
-    def handle_order_placement(self, order_number, user, basket,
-                               shipping_address, shipping_method,
-                               shipping_charge, billing_address, order_total,
-                               surcharges=None, **kwargs):
+    def handle_order_placement(
+        self,
+        order_number,
+        user,
+        basket,
+        shipping_address,
+        shipping_method,
+        shipping_charge,
+        billing_address,
+        order_total,
+        surcharges=None,
+        **kwargs
+    ):
         """
         Write out the order models and return the appropriate HTTP response
 
@@ -102,16 +108,33 @@ class OrderPlacementMixin(CheckoutSessionMixin):
         can happen when a basket gets frozen.
         """
         order = self.place_order(
-            order_number=order_number, user=user, basket=basket,
-            shipping_address=shipping_address, shipping_method=shipping_method,
-            shipping_charge=shipping_charge, order_total=order_total,
-            billing_address=billing_address, surcharges=surcharges, **kwargs)
+            order_number=order_number,
+            user=user,
+            basket=basket,
+            shipping_address=shipping_address,
+            shipping_method=shipping_method,
+            shipping_charge=shipping_charge,
+            order_total=order_total,
+            billing_address=billing_address,
+            surcharges=surcharges,
+            **kwargs
+        )
         basket.submit()
         return self.handle_successful_order(order)
 
-    def place_order(self, order_number, user, basket, shipping_address,
-                    shipping_method, shipping_charge, order_total,
-                    billing_address=None, surcharges=None, **kwargs):
+    def place_order(
+        self,
+        order_number,
+        user,
+        basket,
+        shipping_address,
+        shipping_method,
+        shipping_charge,
+        order_total,
+        billing_address=None,
+        surcharges=None,
+        **kwargs
+    ):
         """
         Writes the order out to the DB including the payment models
         """
@@ -122,17 +145,19 @@ class OrderPlacementMixin(CheckoutSessionMixin):
         # We pass the kwargs as they often include the billing address form
         # which will be needed to save a billing address.
         billing_address = self.create_billing_address(
-            user, billing_address, shipping_address, **kwargs)
+            user, billing_address, shipping_address, **kwargs
+        )
 
-        if 'status' not in kwargs:
+        if "status" not in kwargs:
+            # pylint: disable=assignment-from-none
             status = self.get_initial_order_status(basket)
         else:
-            status = kwargs.pop('status')
+            status = kwargs.pop("status")
 
-        if 'request' not in kwargs:
-            request = getattr(self, 'request', None)
+        if "request" not in kwargs:
+            request = getattr(self, "request", None)
         else:
-            request = kwargs.pop('request')
+            request = kwargs.pop("request")
 
         order = OrderCreator().place_order(
             user=user,
@@ -146,7 +171,8 @@ class OrderPlacementMixin(CheckoutSessionMixin):
             status=status,
             request=request,
             surcharges=surcharges,
-            **kwargs)
+            **kwargs
+        )
         self.save_payment_details(order)
         return order
 
@@ -171,8 +197,7 @@ class OrderPlacementMixin(CheckoutSessionMixin):
         Update the user's address book based on the new shipping address
         """
         try:
-            user_addr = user.addresses.get(
-                hash=addr.generate_hash())
+            user_addr = user.addresses.get(hash=addr.generate_hash())
         except ObjectDoesNotExist:
             # Create a new user address
             user_addr = UserAddress(user=user)
@@ -183,8 +208,10 @@ class OrderPlacementMixin(CheckoutSessionMixin):
             user_addr.num_orders_as_billing_address += 1
         user_addr.save()
 
-    def create_billing_address(self, user, billing_address=None,
-                               shipping_address=None, **kwargs):
+    # pylint: disable=unused-argument
+    def create_billing_address(
+        self, user, billing_address=None, shipping_address=None, **kwargs
+    ):
         """
         Saves any relevant billing data (e.g. a billing address).
         """
@@ -214,7 +241,8 @@ class OrderPlacementMixin(CheckoutSessionMixin):
             event.save()
             for line in order.lines.all():
                 PaymentEventQuantity.objects.create(
-                    event=event, line=line, quantity=line.quantity)
+                    event=event, line=line, quantity=line.quantity
+                )
 
     def save_payment_sources(self, order):
         """
@@ -229,6 +257,7 @@ class OrderPlacementMixin(CheckoutSessionMixin):
             source.order = order
             source.save()
 
+    # pylint: disable=unused-argument
     def get_initial_order_status(self, basket):
         return None
 
@@ -250,7 +279,7 @@ class OrderPlacementMixin(CheckoutSessionMixin):
         self.checkout_session.flush()
 
         # Save order id in session so thank-you page can load it
-        self.request.session['checkout_order_id'] = order.id
+        self.request.session["checkout_order_id"] = order.id
 
         response = HttpResponseRedirect(self.get_success_url())
         self.send_signal(self.request, response, order)
@@ -258,11 +287,15 @@ class OrderPlacementMixin(CheckoutSessionMixin):
 
     def send_signal(self, request, response, order):
         self.view_signal.send(
-            sender=self, order=order, user=request.user,
-            request=request, response=response)
+            sender=self,
+            order=order,
+            user=request.user,
+            request=request,
+            response=response,
+        )
 
     def get_success_url(self):
-        return reverse('checkout:thank-you')
+        return reverse("checkout:thank-you")
 
     def send_order_placed_email(self, order):
         extra_context = self.get_message_context(order)
@@ -271,30 +304,33 @@ class OrderPlacementMixin(CheckoutSessionMixin):
 
     def get_message_context(self, order):
         ctx = {
-            'user': self.request.user,
-            'order': order,
-            'lines': order.lines.all(),
-            'request': self.request,
+            "user": self.request.user,
+            "order": order,
+            "lines": order.lines.all(),
+            "request": self.request,
         }
 
         # Attempt to add the order status URL to the email template ctx.
         try:
             if self.request.user.is_authenticated:
-                path = reverse('customer:order',
-                               kwargs={'order_number': order.number})
+                path = reverse("customer:order", kwargs={"order_number": order.number})
             else:
-                path = reverse('customer:anon-order',
-                               kwargs={'order_number': order.number,
-                                       'hash': order.verification_hash()})
+                path = reverse(
+                    "customer:anon-order",
+                    kwargs={
+                        "order_number": order.number,
+                        "hash": order.verification_hash(),
+                    },
+                )
         except NoReverseMatch:
             # We don't care that much if we can't resolve the URL
             pass
         else:
-            ctx['status_path'] = path
+            ctx["status_path"] = path
 
             # status_url is deprecated, see https://github.com/django-oscar/django-oscar/issues/3826
             site = Site.objects.get_current(self.request)
-            ctx['status_url'] = 'http://%s%s' % (site.domain, path)
+            ctx["status_url"] = "http://%s%s" % (site.domain, path)
         return ctx
 
     # Basket helpers

src/oscar/apps/checkout/session.py

@@ -11,15 +11,13 @@ from oscar.core.loading import get_class, get_model
 
 from . import exceptions
 
-Repository = get_class('shipping.repository', 'Repository')
+Repository = get_class("shipping.repository", "Repository")
 SurchargeApplicator = get_class("checkout.applicator", "SurchargeApplicator")
-OrderTotalCalculator = get_class(
-    'checkout.calculators', 'OrderTotalCalculator')
-CheckoutSessionData = get_class(
-    'checkout.utils', 'CheckoutSessionData')
-ShippingAddress = get_model('order', 'ShippingAddress')
-BillingAddress = get_model('order', 'BillingAddress')
-UserAddress = get_model('address', 'UserAddress')
+OrderTotalCalculator = get_class("checkout.calculators", "OrderTotalCalculator")
+CheckoutSessionData = get_class("checkout.utils", "CheckoutSessionData")
+ShippingAddress = get_model("order", "ShippingAddress")
+BillingAddress = get_model("order", "BillingAddress")
+UserAddress = get_model("address", "UserAddress")
 
 
 class CheckoutSessionMixin(object):
@@ -67,16 +65,15 @@ class CheckoutSessionMixin(object):
                 messages.warning(request, message)
             return http.HttpResponseRedirect(e.url)
 
-        return super().dispatch(
-            request, *args, **kwargs)
+        return super().dispatch(request, *args, **kwargs)
 
     def check_pre_conditions(self, request):
         pre_conditions = self.get_pre_conditions(request)
         for method_name in pre_conditions:
             if not hasattr(self, method_name):
                 raise ImproperlyConfigured(
-                    "There is no method '%s' to call as a pre-condition" % (
-                        method_name))
+                    "There is no method '%s' to call as a pre-condition" % (method_name)
+                )
             getattr(self, method_name)(request)
 
     def get_pre_conditions(self, request):
@@ -92,8 +89,9 @@ class CheckoutSessionMixin(object):
         for method_name in skip_conditions:
             if not hasattr(self, method_name):
                 raise ImproperlyConfigured(
-                    "There is no method '%s' to call as a skip-condition" % (
-                        method_name))
+                    "There is no method '%s' to call as a skip-condition"
+                    % (method_name)
+                )
             getattr(self, method_name)(request)
 
     def get_skip_conditions(self, request):
@@ -109,9 +107,8 @@ class CheckoutSessionMixin(object):
     def check_basket_is_not_empty(self, request):
         if request.basket.is_empty:
             raise exceptions.FailedPreCondition(
-                url=reverse('basket:summary'),
-                message=_(
-                    "You need to add some items to your basket to checkout")
+                url=reverse("basket:summary"),
+                message=_("You need to add some items to your basket to checkout"),
             )
 
     def check_basket_is_valid(self, request):
@@ -120,44 +117,42 @@ class CheckoutSessionMixin(object):
         is, all the basket lines are available to buy - nothing has gone out of
         stock since it was added to the basket.
         """
-        messages = []
+        messages_list = []
         strategy = request.strategy
         for line in request.basket.all_lines():
             result = strategy.fetch_for_line(line)
             is_permitted, reason = result.availability.is_purchase_permitted(
-                line.quantity)
+                line.quantity
+            )
             if not is_permitted:
                 # Create a more meaningful message to show on the basket page
                 msg = _(
                     "'%(title)s' is no longer available to buy (%(reason)s). "
                     "Please adjust your basket to continue"
-                ) % {
-                    'title': line.product.get_title(),
-                    'reason': reason}
-                messages.append(msg)
-        if messages:
+                ) % {"title": line.product.get_title(), "reason": reason}
+                messages_list.append(msg)
+        if messages_list:
             raise exceptions.FailedPreCondition(
-                url=reverse('basket:summary'),
-                messages=messages
+                url=reverse("basket:summary"), messages=messages_list
             )
 
     def check_user_email_is_captured(self, request):
-        if not request.user.is_authenticated \
-                and not self.checkout_session.get_guest_email():
+        if (
+            not request.user.is_authenticated
+            and not self.checkout_session.get_guest_email()
+        ):
             raise exceptions.FailedPreCondition(
-                url=reverse('checkout:index'),
-                message=_(
-                    "Please either sign in or enter your email address")
+                url=reverse("checkout:index"),
+                message=_("Please either sign in or enter your email address"),
             )
 
     def check_shipping_data_is_captured(self, request):
         if not request.basket.is_shipping_required():
             # Even without shipping being required, we still need to check that
             # a shipping method code has been set.
-            if not self.checkout_session.is_shipping_method_set(
-                    self.request.basket):
+            if not self.checkout_session.is_shipping_method_set(self.request.basket):
                 raise exceptions.FailedPreCondition(
-                    url=reverse('checkout:shipping-method'),
+                    url=reverse("checkout:shipping-method"),
                 )
             return
 
@@ -170,40 +165,41 @@ class CheckoutSessionMixin(object):
         # Check that shipping address has been completed
         if not self.checkout_session.is_shipping_address_set():
             raise exceptions.FailedPreCondition(
-                url=reverse('checkout:shipping-address'),
-                message=_("Please choose a shipping address")
+                url=reverse("checkout:shipping-address"),
+                message=_("Please choose a shipping address"),
             )
 
         # Check that the previously chosen shipping address is still valid
-        shipping_address = self.get_shipping_address(
-            basket=self.request.basket)
+        shipping_address = self.get_shipping_address(basket=self.request.basket)
         if not shipping_address:
             raise exceptions.FailedPreCondition(
-                url=reverse('checkout:shipping-address'),
-                message=_("Your previously chosen shipping address is "
-                          "no longer valid.  Please choose another one")
+                url=reverse("checkout:shipping-address"),
+                message=_(
+                    "Your previously chosen shipping address is "
+                    "no longer valid.  Please choose another one"
+                ),
             )
 
     def check_a_valid_shipping_method_is_captured(self):
         # Check that shipping method has been set
-        if not self.checkout_session.is_shipping_method_set(
-                self.request.basket):
+        if not self.checkout_session.is_shipping_method_set(self.request.basket):
             raise exceptions.FailedPreCondition(
-                url=reverse('checkout:shipping-method'),
-                message=_("Please choose a shipping method")
+                url=reverse("checkout:shipping-method"),
+                message=_("Please choose a shipping method"),
             )
 
         # Check that a *valid* shipping method has been set
-        shipping_address = self.get_shipping_address(
-            basket=self.request.basket)
+        shipping_address = self.get_shipping_address(basket=self.request.basket)
         shipping_method = self.get_shipping_method(
-            basket=self.request.basket,
-            shipping_address=shipping_address)
+            basket=self.request.basket, shipping_address=shipping_address
+        )
         if not shipping_method:
             raise exceptions.FailedPreCondition(
-                url=reverse('checkout:shipping-method'),
-                message=_("Your previously chosen shipping method is "
-                          "no longer valid.  Please choose another one")
+                url=reverse("checkout:shipping-method"),
+                message=_(
+                    "Your previously chosen shipping method is "
+                    "no longer valid.  Please choose another one"
+                ),
             )
 
     def check_payment_data_is_captured(self, request):
@@ -221,14 +217,13 @@ class CheckoutSessionMixin(object):
         # not be if the basket is purely downloads
         if not request.basket.is_shipping_required():
             raise exceptions.PassedSkipCondition(
-                url=reverse('checkout:shipping-method')
+                url=reverse("checkout:shipping-method")
             )
 
     def skip_unless_payment_is_required(self, request):
         # Check to see if payment is actually required for this order.
         shipping_address = self.get_shipping_address(request.basket)
-        shipping_method = self.get_shipping_method(
-            request.basket, shipping_address)
+        shipping_method = self.get_shipping_method(request.basket, shipping_address)
         if shipping_method:
             shipping_charge = shipping_method.calculate(request.basket)
         else:
@@ -236,18 +231,15 @@ class CheckoutSessionMixin(object):
             # the time this skip-condition is called. In the absence of any
             # other evidence, we assume the shipping charge is zero.
             shipping_charge = prices.Price(
-                currency=request.basket.currency, excl_tax=D('0.00'),
-                tax=D('0.00')
+                currency=request.basket.currency, excl_tax=D("0.00"), tax=D("0.00")
             )
 
         surcharges = SurchargeApplicator(request).get_applicable_surcharges(
             basket=request.basket, shipping_charge=shipping_charge
         )
         total = self.get_order_totals(request.basket, shipping_charge, surcharges)
-        if total.excl_tax == D('0.00'):
-            raise exceptions.PassedSkipCondition(
-                url=reverse('checkout:preview')
-            )
+        if total.excl_tax == D("0.00"):
+            raise exceptions.PassedSkipCondition(url=reverse("checkout:preview"))
 
     # Helpers
 
@@ -257,7 +249,7 @@ class CheckoutSessionMixin(object):
         ctx = super().get_context_data()
         ctx.update(self.build_submission(**kwargs))
         ctx.update(kwargs)
-        ctx.update(ctx['order_kwargs'])
+        ctx.update(ctx["order_kwargs"])
         return ctx
 
     def build_submission(self, **kwargs):
@@ -270,34 +262,36 @@ class CheckoutSessionMixin(object):
         """
         # Pop the basket if there is one, because we pass it as a positional
         # argument to methods below
-        basket = kwargs.pop('basket', self.request.basket)
+        basket = kwargs.pop("basket", self.request.basket)
         shipping_address = self.get_shipping_address(basket)
-        shipping_method = self.get_shipping_method(
-            basket, shipping_address)
+        shipping_method = self.get_shipping_method(basket, shipping_address)
         billing_address = self.get_billing_address(shipping_address)
         submission = {
-            'user': self.request.user,
-            'basket': basket,
-            'shipping_address': shipping_address,
-            'shipping_method': shipping_method,
-            'billing_address': billing_address,
-            'order_kwargs': {},
-            'payment_kwargs': {}
+            "user": self.request.user,
+            "basket": basket,
+            "shipping_address": shipping_address,
+            "shipping_method": shipping_method,
+            "billing_address": billing_address,
+            "order_kwargs": {},
+            "payment_kwargs": {},
         }
 
         if not shipping_method:
             total = shipping_charge = surcharges = None
         else:
             shipping_charge = shipping_method.calculate(basket)
-            surcharges = SurchargeApplicator(self.request, submission).get_applicable_surcharges(
+            surcharges = SurchargeApplicator(
+                self.request, submission
+            ).get_applicable_surcharges(
                 self.request.basket, shipping_charge=shipping_charge
             )
             total = self.get_order_totals(
-                basket, shipping_charge=shipping_charge, surcharges=surcharges, **kwargs)
+                basket, shipping_charge=shipping_charge, surcharges=surcharges, **kwargs
+            )
 
         submission["shipping_charge"] = shipping_charge
         submission["order_total"] = total
-        submission['surcharges'] = surcharges
+        submission["surcharges"] = surcharges
 
         # If there is a billing address, add it to the payment kwargs as calls
         # to payment gateways generally require the billing address. Note, that
@@ -305,18 +299,20 @@ class CheckoutSessionMixin(object):
         # billing address information. That way, if payment fails, you can
         # render bound forms in the template to make re-submission easier.
         if billing_address:
-            submission['payment_kwargs']['billing_address'] = billing_address
+            submission["payment_kwargs"]["billing_address"] = billing_address
 
         # Allow overrides to be passed in
         submission.update(kwargs)
 
         # Set guest email after overrides as we need to update the order_kwargs
         # entry.
-        user = submission['user']
-        if (not user.is_authenticated
-                and 'guest_email' not in submission['order_kwargs']):
+        user = submission["user"]
+        if (
+            not user.is_authenticated
+            and "guest_email" not in submission["order_kwargs"]
+        ):
             email = self.checkout_session.get_guest_email()
-            submission['order_kwargs']['guest_email'] = email
+            submission["order_kwargs"]["guest_email"] = email
         return submission
 
     def get_shipping_address(self, basket):
@@ -370,8 +366,11 @@ class CheckoutSessionMixin(object):
         """
         code = self.checkout_session.shipping_method_code(basket)
         methods = Repository().get_shipping_methods(
-            basket=basket, user=self.request.user,
-            shipping_addr=shipping_address, request=self.request)
+            basket=basket,
+            user=self.request.user,
+            shipping_addr=shipping_address,
+            request=self.request,
+        )
         for method in methods:
             if method.code == code:
                 return method
@@ -425,4 +424,5 @@ class CheckoutSessionMixin(object):
         Returns the total for the order with and without tax
         """
         return OrderTotalCalculator(self.request).calculate(
-            basket, shipping_charge, surcharges, **kwargs)
+            basket, shipping_charge, surcharges, **kwargs
+        )

src/oscar/apps/checkout/surcharges.py

@@ -40,13 +40,11 @@ class PercentageCharge(BaseSurcharge):
             return prices.Price(
                 currency=basket.currency,
                 excl_tax=total_excl_tax * self.percentage / 100,
-                incl_tax=total_incl_tax * self.percentage / 100
+                incl_tax=total_incl_tax * self.percentage / 100,
             )
         else:
             return prices.Price(
-                currency=basket.currency,
-                excl_tax=D('0.0'),
-                incl_tax=D('0.0')
+                currency=basket.currency, excl_tax=D("0.0"), incl_tax=D("0.0")
             )
 
 
@@ -60,6 +58,5 @@ class FlatCharge(BaseSurcharge):
 
     def calculate(self, basket, **kwargs):
         return prices.Price(
-            currency=basket.currency,
-            excl_tax=self.excl_tax,
-            incl_tax=self.incl_tax)
+            currency=basket.currency, excl_tax=self.excl_tax, incl_tax=self.incl_tax
+        )

src/oscar/apps/checkout/utils.py

@@ -10,7 +10,8 @@ class CheckoutSessionData(object):
     organise checkout form data until it is required to write out the final
     order.
     """
-    SESSION_KEY = 'checkout_data'
+
+    SESSION_KEY = "checkout_data"
 
     def __init__(self, request):
         self.request = request
@@ -67,10 +68,10 @@ class CheckoutSessionData(object):
     # ==============
 
     def set_guest_email(self, email):
-        self._set('guest', 'email', email)
+        self._set("guest", "email", email)
 
     def get_guest_email(self):
-        return self._get('guest', 'email')
+        return self._get("guest", "email")
 
     # Shipping address
     # ================
@@ -80,39 +81,39 @@ class CheckoutSessionData(object):
     # 3. Ship to an address book address (address chosen from list)
 
     def reset_shipping_data(self):
-        self._flush_namespace('shipping')
+        self._flush_namespace("shipping")
 
     def ship_to_user_address(self, address):
         """
         Use an user address (from an address book) as the shipping address.
         """
         self.reset_shipping_data()
-        self._set('shipping', 'user_address_id', address.id)
+        self._set("shipping", "user_address_id", address.id)
 
     def ship_to_new_address(self, address_fields):
         """
         Use a manually entered address as the shipping address
         """
-        self._unset('shipping', 'new_address_fields')
-        phone_number = address_fields.get('phone_number')
+        self._unset("shipping", "new_address_fields")
+        phone_number = address_fields.get("phone_number")
         if phone_number:
             # Phone number is stored as a PhoneNumber instance. As we store
             # strings in the session, we need to serialize it.
             address_fields = address_fields.copy()
-            address_fields['phone_number'] = phone_number.as_international
-        self._set('shipping', 'new_address_fields', address_fields)
+            address_fields["phone_number"] = phone_number.as_international
+        self._set("shipping", "new_address_fields", address_fields)
 
     def new_shipping_address_fields(self):
         """
         Return shipping address fields
         """
-        return self._get('shipping', 'new_address_fields')
+        return self._get("shipping", "new_address_fields")
 
     def shipping_user_address_id(self):
         """
         Return user address id
         """
-        return self._get('shipping', 'user_address_id')
+        return self._get("shipping", "user_address_id")
 
     # Legacy accessor
     user_address_id = shipping_user_address_id
@@ -136,19 +137,20 @@ class CheckoutSessionData(object):
         """
         Set "free shipping" code to session
         """
-        self._set('shipping', 'method_code', '__free__')
+        self._set("shipping", "method_code", "__free__")
 
     def use_shipping_method(self, code):
         """
         Set shipping method code to session
         """
-        self._set('shipping', 'method_code', code)
+        self._set("shipping", "method_code", code)
 
+    # pylint: disable=unused-argument
     def shipping_method_code(self, basket):
         """
         Return the shipping method code
         """
-        return self._get('shipping', 'method_code')
+        return self._get("shipping", "method_code")
 
     def is_shipping_method_set(self, basket):
         """
@@ -168,14 +170,14 @@ class CheckoutSessionData(object):
         """
         Store address fields for a billing address.
         """
-        self._unset('billing', 'new_address_fields')
-        phone_number = address_fields.get('phone_number')
+        self._unset("billing", "new_address_fields")
+        phone_number = address_fields.get("phone_number")
         if phone_number and isinstance(phone_number, PhoneNumber):
             # Phone number is stored as a PhoneNumber instance. As we store
             # strings in the session, we need to serialize it.
             address_fields = address_fields.copy()
-            address_fields['phone_number'] = phone_number.as_international
-        self._set('billing', 'new_address_fields', address_fields)
+            address_fields["phone_number"] = phone_number.as_international
+        self._set("billing", "new_address_fields", address_fields)
 
     def bill_to_user_address(self, address):
         """
@@ -183,34 +185,34 @@ class CheckoutSessionData(object):
 
         :address: The address object
         """
-        self._flush_namespace('billing')
-        self._set('billing', 'user_address_id', address.id)
+        self._flush_namespace("billing")
+        self._set("billing", "user_address_id", address.id)
 
     def bill_to_shipping_address(self):
         """
         Record fact that the billing address is to be the same as
         the shipping address.
         """
-        self._flush_namespace('billing')
-        self._set('billing', 'billing_address_same_as_shipping', True)
+        self._flush_namespace("billing")
+        self._set("billing", "billing_address_same_as_shipping", True)
 
     # Legacy method name
     billing_address_same_as_shipping = bill_to_shipping_address
 
     def is_billing_address_same_as_shipping(self):
-        return self._get('billing', 'billing_address_same_as_shipping', False)
+        return self._get("billing", "billing_address_same_as_shipping", False)
 
     def billing_user_address_id(self):
         """
         Return the ID of the user address being used for billing
         """
-        return self._get('billing', 'user_address_id')
+        return self._get("billing", "user_address_id")
 
     def new_billing_address_fields(self):
         """
         Return fields for a billing address
         """
-        return self._get('billing', 'new_address_fields')
+        return self._get("billing", "new_address_fields")
 
     def is_billing_address_set(self):
         """
@@ -230,22 +232,22 @@ class CheckoutSessionData(object):
     # ===============
 
     def pay_by(self, method):
-        self._set('payment', 'method', method)
+        self._set("payment", "method", method)
 
     def payment_method(self):
-        return self._get('payment', 'method')
+        return self._get("payment", "method")
 
     # Submission methods
     # ==================
 
     def set_order_number(self, order_number):
-        self._set('submission', 'order_number', order_number)
+        self._set("submission", "order_number", order_number)
 
     def get_order_number(self):
-        return self._get('submission', 'order_number')
+        return self._get("submission", "order_number")
 
     def set_submitted_basket(self, basket):
-        self._set('submission', 'basket_id', basket.id)
+        self._set("submission", "basket_id", basket.id)
 
     def get_submitted_basket_id(self):
-        return self._get('submission', 'basket_id')
+        return self._get("submission", "basket_id")

src/oscar/apps/checkout/views.py

@@ -14,25 +14,25 @@ from oscar.core.loading import get_class, get_classes, get_model
 
 from . import signals
 
-ShippingAddressForm, ShippingMethodForm, GatewayForm \
-    = get_classes('checkout.forms', ['ShippingAddressForm', 'ShippingMethodForm', 'GatewayForm'])
-UserAddressForm = get_class('address.forms', 'UserAddressForm')
-Repository = get_class('shipping.repository', 'Repository')
-RedirectRequired, UnableToTakePayment, PaymentError \
-    = get_classes('payment.exceptions', ['RedirectRequired',
-                                         'UnableToTakePayment',
-                                         'PaymentError'])
-UnableToPlaceOrder = get_class('order.exceptions', 'UnableToPlaceOrder')
-OrderPlacementMixin = get_class('checkout.mixins', 'OrderPlacementMixin')
-CheckoutSessionMixin = get_class('checkout.session', 'CheckoutSessionMixin')
-NoShippingRequired = get_class('shipping.methods', 'NoShippingRequired')
-Order = get_model('order', 'Order')
-ShippingAddress = get_model('order', 'ShippingAddress')
-UserAddress = get_model('address', 'UserAddress')
-Country = get_model('address', 'Country')
+ShippingAddressForm, ShippingMethodForm, GatewayForm = get_classes(
+    "checkout.forms", ["ShippingAddressForm", "ShippingMethodForm", "GatewayForm"]
+)
+UserAddressForm = get_class("address.forms", "UserAddressForm")
+Repository = get_class("shipping.repository", "Repository")
+RedirectRequired, UnableToTakePayment, PaymentError = get_classes(
+    "payment.exceptions", ["RedirectRequired", "UnableToTakePayment", "PaymentError"]
+)
+UnableToPlaceOrder = get_class("order.exceptions", "UnableToPlaceOrder")
+OrderPlacementMixin = get_class("checkout.mixins", "OrderPlacementMixin")
+CheckoutSessionMixin = get_class("checkout.session", "CheckoutSessionMixin")
+NoShippingRequired = get_class("shipping.methods", "NoShippingRequired")
+Order = get_model("order", "Order")
+ShippingAddress = get_model("order", "ShippingAddress")
+UserAddress = get_model("address", "UserAddress")
+Country = get_model("address", "Country")
 
 # Standard logger for checkout events
-logger = logging.getLogger('oscar.checkout')
+logger = logging.getLogger("oscar.checkout")
 
 
 class IndexView(CheckoutSessionMixin, generic.FormView):
@@ -40,12 +40,11 @@ class IndexView(CheckoutSessionMixin, generic.FormView):
     First page of the checkout.  We prompt user to either sign in, or
     to proceed as a guest (where we still collect their email address).
     """
-    template_name = 'oscar/checkout/gateway.html'
+
+    template_name = "oscar/checkout/gateway.html"
     form_class = GatewayForm
-    success_url = reverse_lazy('checkout:shipping-address')
-    pre_conditions = [
-        'check_basket_is_not_empty',
-        'check_basket_is_valid']
+    success_url = reverse_lazy("checkout:shipping-address")
+    pre_conditions = ["check_basket_is_not_empty", "check_basket_is_valid"]
 
     def get(self, request, *args, **kwargs):
         # We redirect immediately to shipping address stage if the user is
@@ -53,8 +52,7 @@ class IndexView(CheckoutSessionMixin, generic.FormView):
         if request.user.is_authenticated:
             # We raise a signal to indicate that the user has entered the
             # checkout process so analytics tools can track this event.
-            signals.start_checkout.send_robust(
-                sender=self, request=request)
+            signals.start_checkout.send_robust(sender=self, request=request)
             return self.get_success_response()
         return super().get(request, *args, **kwargs)
 
@@ -62,30 +60,34 @@ class IndexView(CheckoutSessionMixin, generic.FormView):
         kwargs = super().get_form_kwargs()
         email = self.checkout_session.get_guest_email()
         if email:
-            kwargs['initial'] = {
-                'username': email,
+            kwargs["initial"] = {
+                "username": email,
             }
         return kwargs
 
     def form_valid(self, form):
         if form.is_guest_checkout() or form.is_new_account_checkout():
-            email = form.cleaned_data['username']
+            email = form.cleaned_data["username"]
             self.checkout_session.set_guest_email(email)
 
             # We raise a signal to indicate that the user has entered the
             # checkout process by specifying an email address.
             signals.start_checkout.send_robust(
-                sender=self, request=self.request, email=email)
+                sender=self, request=self.request, email=email
+            )
 
             if form.is_new_account_checkout():
                 messages.info(
                     self.request,
-                    _("Create your account and then you will be redirected "
-                      "back to the checkout process"))
+                    _(
+                        "Create your account and then you will be redirected "
+                        "back to the checkout process"
+                    ),
+                )
                 self.success_url = "%s?next=%s&email=%s" % (
-                    reverse('customer:register'),
-                    reverse('checkout:shipping-address'),
-                    quote(email)
+                    reverse("customer:register"),
+                    reverse("checkout:shipping-address"),
+                    quote(email),
                 )
         else:
             user = form.get_user()
@@ -93,8 +95,7 @@ class IndexView(CheckoutSessionMixin, generic.FormView):
 
             # We raise a signal to indicate that the user has entered the
             # checkout process.
-            signals.start_checkout.send_robust(
-                sender=self, request=self.request)
+            signals.start_checkout.send_robust(sender=self, request=self.request)
 
         return redirect(self.get_success_url())
 
@@ -121,13 +122,16 @@ class ShippingAddressView(CheckoutSessionMixin, generic.FormView):
     saved in the session and later saved as ShippingAddress model when the
     order is successfully submitted.
     """
-    template_name = 'oscar/checkout/shipping_address.html'
+
+    template_name = "oscar/checkout/shipping_address.html"
     form_class = ShippingAddressForm
-    success_url = reverse_lazy('checkout:shipping-method')
-    pre_conditions = ['check_basket_is_not_empty',
-                      'check_basket_is_valid',
-                      'check_user_email_is_captured']
-    skip_conditions = ['skip_unless_basket_requires_shipping']
+    success_url = reverse_lazy("checkout:shipping-method")
+    pre_conditions = [
+        "check_basket_is_not_empty",
+        "check_basket_is_valid",
+        "check_user_email_is_captured",
+    ]
+    skip_conditions = ["skip_unless_basket_requires_shipping"]
 
     def get_initial(self):
         initial = self.checkout_session.new_shipping_address_fields()
@@ -136,8 +140,9 @@ class ShippingAddressView(CheckoutSessionMixin, generic.FormView):
             # Convert the primary key stored in the session into a Country
             # instance
             try:
-                initial['country'] = Country.objects.get(
-                    iso_3166_1_a2=initial.pop('country_id'))
+                initial["country"] = Country.objects.get(
+                    iso_3166_1_a2=initial.pop("country_id")
+                )
             except Country.DoesNotExist:
                 # Hmm, the previously selected Country no longer exists. We
                 # ignore this.
@@ -148,7 +153,7 @@ class ShippingAddressView(CheckoutSessionMixin, generic.FormView):
         ctx = super().get_context_data(**kwargs)
         if self.request.user.is_authenticated:
             # Look up address book data
-            ctx['addresses'] = self.get_available_addresses()
+            ctx["addresses"] = self.get_available_addresses()
         return ctx
 
     def get_available_addresses(self):
@@ -156,32 +161,31 @@ class ShippingAddressView(CheckoutSessionMixin, generic.FormView):
         # shipping. Also, use ordering to ensure the default address comes
         # first.
         return self.request.user.addresses.filter(
-            country__is_shipping_country=True).order_by(
-            '-is_default_for_shipping')
+            country__is_shipping_country=True
+        ).order_by("-is_default_for_shipping")
 
     def post(self, request, *args, **kwargs):
         # Check if a shipping address was selected directly (e.g. no form was
         # filled in)
-        if self.request.user.is_authenticated \
-                and 'address_id' in self.request.POST:
+        if self.request.user.is_authenticated and "address_id" in self.request.POST:
             address = UserAddress._default_manager.get(
-                pk=self.request.POST['address_id'], user=self.request.user)
-            action = self.request.POST.get('action', None)
-            if action == 'ship_to':
+                pk=self.request.POST["address_id"], user=self.request.user
+            )
+            action = self.request.POST.get("action", None)
+            if action == "ship_to":
                 # User has selected a previous address to ship to
                 self.checkout_session.ship_to_user_address(address)
                 return redirect(self.get_success_url())
             else:
                 return http.HttpResponseBadRequest()
         else:
-            return super().post(
-                request, *args, **kwargs)
+            return super().post(request, *args, **kwargs)
 
     def form_valid(self, form):
         # Store the address details in the session and redirect to next step
         address_fields = dict(
-            (k, v) for (k, v) in form.instance.__dict__.items()
-            if not k.startswith('_'))
+            (k, v) for (k, v) in form.instance.__dict__.items() if not k.startswith("_")
+        )
         self.checkout_session.ship_to_new_address(address_fields)
         return super().form_valid(form)
 
@@ -190,16 +194,17 @@ class UserAddressUpdateView(CheckoutSessionMixin, generic.UpdateView):
     """
     Update a user address
     """
-    template_name = 'oscar/checkout/user_address_form.html'
+
+    template_name = "oscar/checkout/user_address_form.html"
     form_class = UserAddressForm
-    success_url = reverse_lazy('checkout:shipping-address')
+    success_url = reverse_lazy("checkout:shipping-address")
 
     def get_queryset(self):
         return self.request.user.addresses.all()
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['user'] = self.request.user
+        kwargs["user"] = self.request.user
         return kwargs
 
     def get_success_url(self):
@@ -211,8 +216,9 @@ class UserAddressDeleteView(CheckoutSessionMixin, generic.DeleteView):
     """
     Delete an address from a user's address book.
     """
-    template_name = 'oscar/checkout/user_address_delete.html'
-    success_url = reverse_lazy('checkout:shipping-address')
+
+    template_name = "oscar/checkout/user_address_delete.html"
+    success_url = reverse_lazy("checkout:shipping-address")
 
     def get_queryset(self):
         return self.request.user.addresses.all()
@@ -227,6 +233,7 @@ class UserAddressDeleteView(CheckoutSessionMixin, generic.DeleteView):
 # ===============
 
 
+# pylint: disable=attribute-defined-outside-init
 class ShippingMethodView(CheckoutSessionMixin, generic.FormView):
     """
     View for allowing a user to choose a shipping method.
@@ -239,12 +246,15 @@ class ShippingMethodView(CheckoutSessionMixin, generic.FormView):
     automatically selected.  Otherwise, a page is rendered where
     the user can choose the appropriate one.
     """
-    template_name = 'oscar/checkout/shipping_methods.html'
+
+    template_name = "oscar/checkout/shipping_methods.html"
     form_class = ShippingMethodForm
-    pre_conditions = ['check_basket_is_not_empty',
-                      'check_basket_is_valid',
-                      'check_user_email_is_captured']
-    success_url = reverse_lazy('checkout:payment-method')
+    pre_conditions = [
+        "check_basket_is_not_empty",
+        "check_basket_is_valid",
+        "check_user_email_is_captured",
+    ]
+    success_url = reverse_lazy("checkout:payment-method")
 
     def post(self, request, *args, **kwargs):
         self._methods = self.get_available_shipping_methods()
@@ -258,24 +268,27 @@ class ShippingMethodView(CheckoutSessionMixin, generic.FormView):
         # Check that shipping is required at all
         if not request.basket.is_shipping_required():
             # No shipping required - we store a special code to indicate so.
-            self.checkout_session.use_shipping_method(
-                NoShippingRequired().code)
+            self.checkout_session.use_shipping_method(NoShippingRequired().code)
             return self.get_success_response()
 
         # Check that shipping address has been completed
         if not self.checkout_session.is_shipping_address_set():
             messages.error(request, _("Please choose a shipping address"))
-            return redirect('checkout:shipping-address')
+            return redirect("checkout:shipping-address")
 
         # Save shipping methods as instance var as we need them both here
         # and when setting the context vars.
         self._methods = self.get_available_shipping_methods()
         if len(self._methods) == 0:
             # No shipping methods available for given address
-            messages.warning(request, _(
-                "Shipping is unavailable for your chosen address - please "
-                "choose another"))
-            return redirect('checkout:shipping-address')
+            messages.warning(
+                request,
+                _(
+                    "Shipping is unavailable for your chosen address - please "
+                    "choose another"
+                ),
+            )
+            return redirect("checkout:shipping-address")
         elif len(self._methods) == 1:
             # Only one shipping method - set this and redirect onto the next
             # step
@@ -288,12 +301,12 @@ class ShippingMethodView(CheckoutSessionMixin, generic.FormView):
 
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
-        kwargs['methods'] = self._methods
+        kwargs["methods"] = self._methods
         return kwargs
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['methods'] = self._methods
+        kwargs["methods"] = self._methods
         return kwargs
 
     def get_available_shipping_methods(self):
@@ -305,19 +318,22 @@ class ShippingMethodView(CheckoutSessionMixin, generic.FormView):
         # repository).  I haven't come across a scenario that doesn't fit this
         # system.
         return Repository().get_shipping_methods(
-            basket=self.request.basket, user=self.request.user,
+            basket=self.request.basket,
+            user=self.request.user,
             shipping_addr=self.get_shipping_address(self.request.basket),
-            request=self.request)
+            request=self.request,
+        )
 
     def form_valid(self, form):
         # Save the code for the chosen shipping method in the session
         # and continue to the next step.
-        self.checkout_session.use_shipping_method(form.cleaned_data['method_code'])
+        self.checkout_session.use_shipping_method(form.cleaned_data["method_code"])
         return self.get_success_response()
 
     def form_invalid(self, form):
-        messages.error(self.request, _("Your submitted shipping method is not"
-                                       " permitted"))
+        messages.error(
+            self.request, _("Your submitted shipping method is not permitted")
+        )
         return super().form_invalid(form)
 
     def get_success_response(self):
@@ -337,13 +353,15 @@ class PaymentMethodView(CheckoutSessionMixin, generic.TemplateView):
     between multiple sources. It's not the place for entering sensitive details
     like bankcard numbers though - that belongs on the payment details view.
     """
+
     pre_conditions = [
-        'check_basket_is_not_empty',
-        'check_basket_is_valid',
-        'check_user_email_is_captured',
-        'check_shipping_data_is_captured']
-    skip_conditions = ['skip_unless_payment_is_required']
-    success_url = reverse_lazy('checkout:payment-details')
+        "check_basket_is_not_empty",
+        "check_basket_is_valid",
+        "check_user_email_is_captured",
+        "check_shipping_data_is_captured",
+    ]
+    skip_conditions = ["skip_unless_payment_is_required"]
+    success_url = reverse_lazy("checkout:payment-details")
 
     def get(self, request, *args, **kwargs):
         # By default we redirect straight onto the payment details view. Shops
@@ -395,16 +413,18 @@ class PaymentDetailsView(OrderPlacementMixin, generic.TemplateView):
     All projects will need to subclass and customise this class as no payment
     is taken by default.
     """
-    template_name = 'oscar/checkout/payment_details.html'
-    template_name_preview = 'oscar/checkout/preview.html'
+
+    template_name = "oscar/checkout/payment_details.html"
+    template_name_preview = "oscar/checkout/preview.html"
 
     # These conditions are extended at runtime depending on whether we are in
     # 'preview' mode or not.
     pre_conditions = [
-        'check_basket_is_not_empty',
-        'check_basket_is_valid',
-        'check_user_email_is_captured',
-        'check_shipping_data_is_captured']
+        "check_basket_is_not_empty",
+        "check_basket_is_valid",
+        "check_user_email_is_captured",
+        "check_shipping_data_is_captured",
+    ]
 
     # If preview=True, then we render a preview template that shows all order
     # details ready for submission.
@@ -414,13 +434,13 @@ class PaymentDetailsView(OrderPlacementMixin, generic.TemplateView):
         if self.preview:
             # The preview view needs to ensure payment information has been
             # correctly captured.
-            return self.pre_conditions + ['check_payment_data_is_captured']
+            return self.pre_conditions + ["check_payment_data_is_captured"]
         return super().get_pre_conditions(request)
 
     def get_skip_conditions(self, request):
         if not self.preview:
             # Payment details should only be collected if necessary
-            return ['skip_unless_payment_is_required']
+            return ["skip_unless_payment_is_required"]
         return super().get_skip_conditions(request)
 
     def post(self, request, *args, **kwargs):
@@ -433,7 +453,7 @@ class PaymentDetailsView(OrderPlacementMixin, generic.TemplateView):
         # an order (normally from the preview page).  Without this, we assume a
         # payment form is being submitted from the payment details view. In
         # this case, the form needs validating and the order preview shown.
-        if request.POST.get('action', '') == 'place_order':
+        if request.POST.get("action", "") == "place_order":
             return self.handle_place_order_submission(request)
         return self.handle_payment_details_submission(request)
 
@@ -511,9 +531,19 @@ class PaymentDetailsView(OrderPlacementMixin, generic.TemplateView):
         except UserAddress.DoesNotExist:
             return None
 
-    def submit(self, user, basket, shipping_address, shipping_method,  # noqa (too complex (10))
-               shipping_charge, billing_address, order_total,
-               payment_kwargs=None, order_kwargs=None, surcharges=None):
+    def submit(
+        self,
+        user,
+        basket,
+        shipping_address,
+        shipping_method,
+        shipping_charge,
+        billing_address,
+        order_total,
+        payment_kwargs=None,
+        order_kwargs=None,
+        surcharges=None,
+    ):
         """
         Submit a basket for order placement.
 
@@ -541,10 +571,12 @@ class PaymentDetailsView(OrderPlacementMixin, generic.TemplateView):
             order_kwargs = {}
 
         # Taxes must be known at this point
-        assert basket.is_tax_known, (
-            "Basket tax must be set before a user can place an order")
-        assert shipping_charge.is_tax_known, (
-            "Shipping charge tax must be set before a user can place an order")
+        assert (
+            basket.is_tax_known
+        ), "Basket tax must be set before a user can place an order"
+        assert (
+            shipping_charge.is_tax_known
+        ), "Shipping charge tax must be set before a user can place an order"
 
         # We generate the order number first as this will be used
         # in payment requests (ie before the order model has been
@@ -553,8 +585,11 @@ class PaymentDetailsView(OrderPlacementMixin, generic.TemplateView):
         # the order on a different request).
         order_number = self.generate_order_number(basket)
         self.checkout_session.set_order_number(order_number)
-        logger.info("Order #%s: beginning submission process for basket #%d",
-                    order_number, basket.id)
+        logger.info(
+            "Order #%s: beginning submission process for basket #%d",
+            order_number,
+            basket.id,
+        )
 
         # Freeze the basket so it cannot be manipulated while the customer is
         # completing payment on a 3rd party site.  Also, store a reference to
@@ -566,9 +601,11 @@ class PaymentDetailsView(OrderPlacementMixin, generic.TemplateView):
 
         # We define a general error message for when an unanticipated payment
         # error occurs.
-        error_msg = _("A problem occurred while processing payment for this "
-                      "order - no payment has been taken.  Please "
-                      "contact customer services if this problem persists")
+        error_msg = _(
+            "A problem occurred while processing payment for this "
+            "order - no payment has been taken.  Please "
+            "contact customer services if this problem persists"
+        )
 
         signals.pre_payment.send_robust(sender=self, view=self)
 
@@ -586,13 +623,16 @@ class PaymentDetailsView(OrderPlacementMixin, generic.TemplateView):
             msg = str(e)
             logger.warning(
                 "Order #%s: unable to take payment (%s) - restoring basket",
-                order_number, msg)
+                order_number,
+                msg,
+            )
             self.restore_frozen_basket()
 
             # We assume that the details submitted on the payment details view
             # were invalid (e.g. expired bankcard).
             return self.render_payment_details(
-                self.request, error=msg, **payment_kwargs)
+                self.request, error=msg, **payment_kwargs
+            )
         except PaymentError as e:
             # A general payment error - Something went wrong which wasn't
             # anticipated.  Eg, the payment gateway is down (it happens), your
@@ -601,51 +641,68 @@ class PaymentDetailsView(OrderPlacementMixin, generic.TemplateView):
             # mail admins on an error as this issue warrants some further
             # investigation.
             msg = str(e)
-            logger.error("Order #%s: payment error (%s)", order_number, msg,
-                         exc_info=True)
+            logger.error(
+                "Order #%s: payment error (%s)", order_number, msg, exc_info=True
+            )
             self.restore_frozen_basket()
-            return self.render_preview(
-                self.request, error=error_msg, **payment_kwargs)
+            return self.render_preview(self.request, error=error_msg, **payment_kwargs)
         except Exception as e:
             # Unhandled exception - hopefully, you will only ever see this in
             # development...
             logger.exception(
                 "Order #%s: unhandled exception while taking payment (%s)",
-                order_number, e)
+                order_number,
+                e,
+            )
             self.restore_frozen_basket()
-            return self.render_preview(
-                self.request, error=error_msg, **payment_kwargs)
+            return self.render_preview(self.request, error=error_msg, **payment_kwargs)
 
         signals.post_payment.send_robust(sender=self, view=self)
 
         # If all is ok with payment, try and place order
-        logger.info("Order #%s: payment successful, placing order",
-                    order_number)
+        logger.info("Order #%s: payment successful, placing order", order_number)
         try:
             return self.handle_order_placement(
-                order_number, user, basket, shipping_address, shipping_method,
-                shipping_charge, billing_address, order_total, surcharges=surcharges, **order_kwargs)
+                order_number,
+                user,
+                basket,
+                shipping_address,
+                shipping_method,
+                shipping_charge,
+                billing_address,
+                order_total,
+                surcharges=surcharges,
+                **order_kwargs
+            )
         except UnableToPlaceOrder as e:
             # It's possible that something will go wrong while trying to
             # actually place an order.  Not a good situation to be in as a
             # payment transaction may already have taken place, but needs
             # to be handled gracefully.
             msg = str(e)
-            logger.error("Order #%s: unable to place order - %s",
-                         order_number, msg, exc_info=True)
+            logger.error(
+                "Order #%s: unable to place order - %s",
+                order_number,
+                msg,
+                exc_info=True,
+            )
             self.restore_frozen_basket()
-            return self.render_preview(
-                self.request, error=msg, **payment_kwargs)
+            return self.render_preview(self.request, error=msg, **payment_kwargs)
         except Exception as e:
             # Hopefully you only ever reach this in development
-            logger.exception("Order #%s: unhandled exception while placing order (%s)", order_number, e)
-            error_msg = _("A problem occurred while placing this order. Please contact customer services.")
+            logger.exception(
+                "Order #%s: unhandled exception while placing order (%s)",
+                order_number,
+                e,
+            )
+            error_msg = _(
+                "A problem occurred while placing this order. Please contact customer services."
+            )
             self.restore_frozen_basket()
             return self.render_preview(self.request, error=error_msg, **payment_kwargs)
 
     def get_template_names(self):
-        return [self.template_name_preview] if self.preview else [
-            self.template_name]
+        return [self.template_name_preview] if self.preview else [self.template_name]
 
 
 # =========
@@ -657,8 +714,9 @@ class ThankYouView(generic.DetailView):
     """
     Displays the 'thank you' page which summarises the order just submitted.
     """
-    template_name = 'oscar/checkout/thank_you.html'
-    context_object_name = 'order'
+
+    template_name = "oscar/checkout/thank_you.html"
+    context_object_name = "order"
 
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
@@ -672,27 +730,28 @@ class ThankYouView(generic.DetailView):
         order = None
         if self.request.user.is_superuser:
             kwargs = {}
-            if 'order_number' in self.request.GET:
-                kwargs['number'] = self.request.GET['order_number']
-            elif 'order_id' in self.request.GET:
-                kwargs['id'] = self.request.GET['order_id']
+            if "order_number" in self.request.GET:
+                kwargs["number"] = self.request.GET["order_number"]
+            elif "order_id" in self.request.GET:
+                kwargs["id"] = self.request.GET["order_id"]
             order = Order._default_manager.filter(**kwargs).first()
 
         if not order:
-            if 'checkout_order_id' in self.request.session:
+            if "checkout_order_id" in self.request.session:
                 order = Order._default_manager.filter(
-                    pk=self.request.session['checkout_order_id']).first()
+                    pk=self.request.session["checkout_order_id"]
+                ).first()
         return order
 
     def get_context_data(self, *args, **kwargs):
         ctx = super().get_context_data(*args, **kwargs)
         # Remember whether this view has been loaded.
         # Only send tracking information on the first load.
-        key = 'order_{}_thankyou_viewed'.format(ctx['order'].pk)
+        key = "order_{}_thankyou_viewed".format(ctx["order"].pk)
         if not self.request.session.get(key, False):
             self.request.session[key] = True
-            ctx['send_analytics_event'] = True
+            ctx["send_analytics_event"] = True
         else:
-            ctx['send_analytics_event'] = False
+            ctx["send_analytics_event"] = False
 
         return ctx

src/oscar/apps/communication/__init__.py

@@ -1 +1 @@
-default_app_config = 'oscar.apps.communication.apps.CommunicationConfig'
+default_app_config = "oscar.apps.communication.apps.CommunicationConfig"

src/oscar/apps/communication/abstract_models.py

@@ -15,32 +15,38 @@ class AbstractEmail(models.Model):
     """
     This is a record of an email sent to a customer.
     """
+
     user = models.ForeignKey(
         AUTH_USER_MODEL,
         on_delete=models.CASCADE,
-        related_name='emails',
+        related_name="emails",
         verbose_name=_("User"),
-        null=True)
-    email = models.EmailField(_('Email Address'), null=True, blank=True)
-    subject = models.TextField(_('Subject'), max_length=255)
+        null=True,
+    )
+    email = models.EmailField(_("Email Address"), null=True, blank=True)
+    subject = models.TextField(_("Subject"), max_length=255)
     body_text = models.TextField(_("Body Text"))
     body_html = models.TextField(_("Body HTML"), blank=True)
     date_sent = models.DateTimeField(_("Date Sent"), auto_now_add=True)
 
     class Meta:
         abstract = True
-        app_label = 'communication'
-        ordering = ['-date_sent']
-        verbose_name = _('Email')
-        verbose_name_plural = _('Emails')
+        app_label = "communication"
+        ordering = ["-date_sent"]
+        verbose_name = _("Email")
+        verbose_name_plural = _("Emails")
 
     def __str__(self):
         if self.user:
             return _("Email to %(user)s with subject '%(subject)s'") % {
-                'user': self.user.get_username(), 'subject': self.subject}
+                "user": self.user.get_username(),
+                "subject": self.subject,
+            }
         else:
             return _("Email to %(email)s with subject '%(subject)s'") % {
-                'email': self.email, 'subject': self.subject}
+                "email": self.email,
+                "subject": self.subject,
+            }
 
 
 class AbstractCommunicationEventType(models.Model):
@@ -52,48 +58,66 @@ class AbstractCommunicationEventType(models.Model):
     # e.g. PASSWORD_RESET. AutoSlugField uppercases the code for us because
     # it's a useful convention that's been enforced in previous Oscar versions
     code = AutoSlugField(
-        _('Code'), max_length=128, unique=True, populate_from='name',
-        separator='_', uppercase=True, editable=True,
+        _("Code"),
+        max_length=128,
+        unique=True,
+        populate_from="name",
+        separator="_",
+        uppercase=True,
+        editable=True,
         validators=[
             RegexValidator(
-                regex=r'^[A-Z_][0-9A-Z_]*$',
+                regex=r"^[A-Z_][0-9A-Z_]*$",
                 message=_(
                     "Code can only contain the uppercase letters (A-Z), "
-                    "digits, and underscores, and can't start with a digit."))],
-        help_text=_("Code used for looking up this event programmatically"))
+                    "digits, and underscores, and can't start with a digit."
+                ),
+            )
+        ],
+        help_text=_("Code used for looking up this event programmatically"),
+    )
 
     #: Name is the friendly description of an event for use in the admin
-    name = models.CharField(_('Name'), max_length=255, db_index=True)
+    name = models.CharField(_("Name"), max_length=255, db_index=True)
 
     # We allow communication types to be categorised
     # For backwards-compatibility, the choice values are quite verbose
-    ORDER_RELATED = 'Order related'
-    USER_RELATED = 'User related'
+    ORDER_RELATED = "Order related"
+    USER_RELATED = "User related"
     CATEGORY_CHOICES = (
-        (ORDER_RELATED, _('Order related')),
-        (USER_RELATED, _('User related'))
+        (ORDER_RELATED, _("Order related")),
+        (USER_RELATED, _("User related")),
     )
 
     category = models.CharField(
-        _('Category'), max_length=255, default=ORDER_RELATED,
-        choices=CATEGORY_CHOICES)
+        _("Category"), max_length=255, default=ORDER_RELATED, choices=CATEGORY_CHOICES
+    )
 
     # Template content for emails
     # NOTE: There's an intentional distinction between None and ''. None
     # instructs Oscar to look for a file-based template, '' is just an empty
     # template.
     email_subject_template = models.CharField(
-        _('Email Subject Template'), max_length=255, blank=True, null=True)
+        _("Email Subject Template"), max_length=255, blank=True, null=True
+    )
     email_body_template = models.TextField(
-        _('Email Body Template'), blank=True, null=True)
+        _("Email Body Template"), blank=True, null=True
+    )
     email_body_html_template = models.TextField(
-        _('Email Body HTML Template'), blank=True, null=True,
-        help_text=_("HTML template"))
+        _("Email Body HTML Template"),
+        blank=True,
+        null=True,
+        help_text=_("HTML template"),
+    )
 
     # Template content for SMS messages
-    sms_template = models.CharField(_('SMS Template'), max_length=170,
-                                    blank=True, null=True,
-                                    help_text=_("SMS template"))
+    sms_template = models.CharField(
+        _("SMS Template"),
+        max_length=170,
+        blank=True,
+        null=True,
+        help_text=_("SMS template"),
+    )
 
     date_created = models.DateTimeField(_("Date Created"), auto_now_add=True)
     date_updated = models.DateTimeField(_("Date Updated"), auto_now=True)
@@ -101,15 +125,15 @@ class AbstractCommunicationEventType(models.Model):
     objects = CommunicationTypeManager()
 
     # File templates
-    email_subject_template_file = 'oscar/communication/emails/commtype_%s_subject.txt'
-    email_body_template_file = 'oscar/communication/emails/commtype_%s_body.txt'
-    email_body_html_template_file = 'oscar/communication/emails/commtype_%s_body.html'
-    sms_template_file = 'oscar/communication/sms/commtype_%s_body.txt'
+    email_subject_template_file = "oscar/communication/emails/commtype_%s_subject.txt"
+    email_body_template_file = "oscar/communication/emails/commtype_%s_body.txt"
+    email_body_html_template_file = "oscar/communication/emails/commtype_%s_body.html"
+    sms_template_file = "oscar/communication/sms/commtype_%s_body.txt"
 
     class Meta:
         abstract = True
-        app_label = 'communication'
-        ordering = ['name']
+        app_label = "communication"
+        ordering = ["name"]
         verbose_name = _("Communication event type")
         verbose_name_plural = _("Communication event types")
 
@@ -123,15 +147,17 @@ class AbstractCommunicationEventType(models.Model):
         code = self.code.lower()
 
         # Build a dict of message name to Template instances
-        templates = {'subject': 'email_subject_template',
-                     'body': 'email_body_template',
-                     'html': 'email_body_html_template',
-                     'sms': 'sms_template'}
+        templates = {
+            "subject": "email_subject_template",
+            "body": "email_body_template",
+            "html": "email_body_html_template",
+            "sms": "sms_template",
+        }
         for name, attr_name in templates.items():
             field = getattr(self, attr_name, None)
             if field is not None:
                 # Template content is in a model field
-                templates[name] = engines['django'].from_string(field)
+                templates[name] = engines["django"].from_string(field)
             else:
                 # Model field is empty - look for a file template
                 template_name = getattr(self, "%s_file" % attr_name) % code
@@ -143,16 +169,16 @@ class AbstractCommunicationEventType(models.Model):
         # Pass base URL for serving images within HTML emails
         if ctx is None:
             ctx = {}
-        ctx['static_base_url'] = getattr(
-            settings, 'OSCAR_STATIC_BASE_URL', None)
+        ctx["static_base_url"] = getattr(settings, "OSCAR_STATIC_BASE_URL", None)
 
         messages = {}
         for name, template in templates.items():
-            messages[name] = template.render(ctx) if template else ''
+            # pylint: disable=no-member
+            messages[name] = template.render(ctx) if template else ""
 
         # Ensure the email subject doesn't contain any newlines
-        messages['subject'] = messages['subject'].replace("\n", "")
-        messages['subject'] = messages['subject'].replace("\r", "")
+        messages["subject"] = messages["subject"].replace("\n", "")
+        messages["subject"] = messages["subject"].replace("\r", "")
 
         return messages
 
@@ -168,36 +194,29 @@ class AbstractCommunicationEventType(models.Model):
 
 class AbstractNotification(models.Model):
     recipient = models.ForeignKey(
-        AUTH_USER_MODEL,
-        on_delete=models.CASCADE,
-        related_name='notifications')
+        AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="notifications"
+    )
 
     # Not all notifications will have a sender.
-    sender = models.ForeignKey(
-        AUTH_USER_MODEL,
-        on_delete=models.CASCADE,
-        null=True)
+    sender = models.ForeignKey(AUTH_USER_MODEL, on_delete=models.CASCADE, null=True)
 
     # HTML is allowed in this field as it can contain links
     subject = models.CharField(max_length=255)
     body = models.TextField()
 
-    INBOX, ARCHIVE = 'Inbox', 'Archive'
-    choices = (
-        (INBOX, _('Inbox')),
-        (ARCHIVE, _('Archive')))
-    location = models.CharField(max_length=32, choices=choices,
-                                default=INBOX)
+    INBOX, ARCHIVE = "Inbox", "Archive"
+    choices = ((INBOX, _("Inbox")), (ARCHIVE, _("Archive")))
+    location = models.CharField(max_length=32, choices=choices, default=INBOX)
 
     date_sent = models.DateTimeField(auto_now_add=True)
     date_read = models.DateTimeField(blank=True, null=True)
 
     class Meta:
         abstract = True
-        app_label = 'communication'
-        ordering = ('-date_sent',)
-        verbose_name = _('Notification')
-        verbose_name_plural = _('Notifications')
+        app_label = "communication"
+        ordering = ("-date_sent",)
+        verbose_name = _("Notification")
+        verbose_name_plural = _("Notifications")
 
     def __str__(self):
         return self.subject
@@ -205,6 +224,7 @@ class AbstractNotification(models.Model):
     def archive(self):
         self.location = self.ARCHIVE
         self.save()
+
     archive.alters_data = True
 
     @property

src/oscar/apps/communication/admin.py

@@ -2,8 +2,8 @@ from django.contrib import admin
 
 from oscar.core.loading import get_model
 
-CommunicationEventType = get_model('communication', 'CommunicationEventType')
-Email = get_model('communication', 'Email')
+CommunicationEventType = get_model("communication", "CommunicationEventType")
+Email = get_model("communication", "Email")
 
 
 admin.site.register(Email)

src/oscar/apps/communication/app.py

@@ -1,69 +1,99 @@
-from django.contrib.auth.decorators import login_required
-from django.urls import path
-from django.views import generic
-
-from oscar.core.application import Application
-from oscar.core.loading import get_class
-
-
-class CommunicationApplication(Application):
-    name = 'communication'
-
-    alert_list_view = get_class(
-        'communication.alerts.views', 'ProductAlertListView')
-    alert_create_view = get_class(
-        'communication.alerts.views', 'ProductAlertCreateView')
-    alert_confirm_view = get_class(
-        'communication.alerts.views', 'ProductAlertConfirmView')
-    alert_cancel_view = get_class(
-        'communication.alerts.views', 'ProductAlertCancelView')
-
-    notification_inbox_view = get_class(
-        'communication.notifications.views', 'InboxView')
-    notification_archive_view = get_class(
-        'communication.notifications.views', 'ArchiveView')
-    notification_update_view = get_class(
-        'communication.notifications.views', 'UpdateView')
-    notification_detail_view = get_class(
-        'communication.notifications.views', 'DetailView')
-
-    def get_urls(self):
-        urls = [
-            # Alerts
-            # Alerts can be setup by anonymous users: some views do not
-            # require login
-            path('alerts/', login_required(self.alert_list_view.as_view()), name='alerts-list'),
-            path('alerts/create/<int:pk>/', self.alert_create_view.as_view(), name='alert-create'),
-            path('alerts/confirm/<str:key>/', self.alert_confirm_view.as_view(), name='alerts-confirm'),
-            path('alerts/cancel/key/<str:key>/', self.alert_cancel_view.as_view(), name='alerts-cancel-by-key'),
-            path(
-                'alerts/cancel/<int:pk>/',
-                login_required(self.alert_cancel_view.as_view()),
-                name='alerts-cancel-by-pk'),
-
-            # Notifications
-            # Redirect to notification inbox
-            path(
-                'notifications/', generic.RedirectView.as_view(url='/accounts/notifications/inbox/', permanent=False)),
-            path(
-                'notifications/inbox/',
-                login_required(self.notification_inbox_view.as_view()),
-                name='notifications-inbox'),
-            path(
-                'notifications/archive/',
-                login_required(self.notification_archive_view.as_view()),
-                name='notifications-archive'),
-            path(
-                'notifications/update/',
-                login_required(self.notification_update_view.as_view()),
-                name='notifications-update'),
-            path(
-                'notifications/<int:pk>/',
-                login_required(self.notification_detail_view.as_view()),
-                name='notifications-detail'),
-        ]
-
-        return self.post_process_urls(urls)
-
-
-application = CommunicationApplication()
+# from django.contrib.auth.decorators import login_required
+# from django.urls import path
+# from django.views import generic
+#
+# from oscar.core.application import Application
+# from oscar.core.loading import get_class
+#
+#
+# class CommunicationApplication(Application):
+#     name = "communication"
+#
+#     alert_list_view = get_class("communication.alerts.views", "ProductAlertListView")
+#     alert_create_view = get_class(
+#         "communication.alerts.views", "ProductAlertCreateView"
+#     )
+#     alert_confirm_view = get_class(
+#         "communication.alerts.views", "ProductAlertConfirmView"
+#     )
+#     alert_cancel_view = get_class(
+#         "communication.alerts.views", "ProductAlertCancelView"
+#     )
+#
+#     notification_inbox_view = get_class(
+#         "communication.notifications.views", "InboxView"
+#     )
+#     notification_archive_view = get_class(
+#         "communication.notifications.views", "ArchiveView"
+#     )
+#     notification_update_view = get_class(
+#         "communication.notifications.views", "UpdateView"
+#     )
+#     notification_detail_view = get_class(
+#         "communication.notifications.views", "DetailView"
+#     )
+#
+#     def get_urls(self):
+#         urls = [
+#             # Alerts
+#             # Alerts can be setup by anonymous users: some views do not
+#             # require login
+#             path(
+#                 "alerts/",
+#                 login_required(self.alert_list_view.as_view()),
+#                 name="alerts-list",
+#             ),
+#             path(
+#                 "alerts/create/<int:pk>/",
+#                 self.alert_create_view.as_view(),
+#                 name="alert-create",
+#             ),
+#             path(
+#                 "alerts/confirm/<str:key>/",
+#                 self.alert_confirm_view.as_view(),
+#                 name="alerts-confirm",
+#             ),
+#             path(
+#                 "alerts/cancel/key/<str:key>/",
+#                 self.alert_cancel_view.as_view(),
+#                 name="alerts-cancel-by-key",
+#             ),
+#             path(
+#                 "alerts/cancel/<int:pk>/",
+#                 login_required(self.alert_cancel_view.as_view()),
+#                 name="alerts-cancel-by-pk",
+#             ),
+#             # Notifications
+#             # Redirect to notification inbox
+#             path(
+#                 "notifications/",
+#                 generic.RedirectView.as_view(
+#                     url="/accounts/notifications/inbox/", permanent=False
+#                 ),
+#             ),
+#             path(
+#                 "notifications/inbox/",
+#                 login_required(self.notification_inbox_view.as_view()),
+#                 name="notifications-inbox",
+#             ),
+#             path(
+#                 "notifications/archive/",
+#                 login_required(self.notification_archive_view.as_view()),
+#                 name="notifications-archive",
+#             ),
+#             path(
+#                 "notifications/update/",
+#                 login_required(self.notification_update_view.as_view()),
+#                 name="notifications-update",
+#             ),
+#             path(
+#                 "notifications/<int:pk>/",
+#                 login_required(self.notification_detail_view.as_view()),
+#                 name="notifications-detail",
+#             ),
+#         ]
+#
+#         return self.post_process_urls(urls)
+#
+#
+# application = CommunicationApplication()

src/oscar/apps/communication/apps.py

@@ -4,6 +4,6 @@ from oscar.core.application import OscarConfig
 
 
 class CommunicationConfig(OscarConfig):
-    label = 'communication'
-    name = 'oscar.apps.communication'
-    verbose_name = _('Communication')
+    label = "communication"
+    name = "oscar.apps.communication"
+    verbose_name = _("Communication")

src/oscar/apps/communication/config.py

@@ -3,9 +3,6 @@ from django.utils.translation import gettext_lazy as _
 
 
 class CommunicationConfig(AppConfig):
-    label = 'communication'
-    name = 'oscar.apps.communication'
-    verbose_name = _('Communication')
-
-    def ready(self):
-        from .alerts import receivers  # noqa
+    label = "communication"
+    name = "oscar.apps.communication"
+    verbose_name = _("Communication")

src/oscar/apps/communication/managers.py

@@ -2,7 +2,6 @@ from django.db import models
 
 
 class CommunicationTypeManager(models.Manager):
-
     def get_and_render(self, code, context):
         """
         Return a dictionary of rendered messages, ready for sending.

src/oscar/apps/communication/models.py

@@ -1,26 +1,30 @@
+# pylint: disable=wildcard-import, unused-wildcard-import
 from oscar.core.loading import is_model_registered
 
-from .abstract_models import *  # noqa
+from .abstract_models import *
 
 __all__ = []
 
 
-if not is_model_registered('communication', 'Email'):
+if not is_model_registered("communication", "Email"):
+
     class Email(AbstractEmail):
         pass
 
-    __all__.append('Email')
+    __all__.append("Email")
+
 
+if not is_model_registered("communication", "CommunicationEventType"):
 
-if not is_model_registered('communication', 'CommunicationEventType'):
     class CommunicationEventType(AbstractCommunicationEventType):
         pass
 
-    __all__.append('CommunicationEventType')
+    __all__.append("CommunicationEventType")
+
 
+if not is_model_registered("communication", "Notification"):
 
-if not is_model_registered('communication', 'Notification'):
     class Notification(AbstractNotification):
         pass
 
-    __all__.append('Notification')
+    __all__.append("Notification")

src/oscar/apps/communication/notifications/context_processors.py

@@ -1,12 +1,13 @@
 from oscar.core.loading import get_model
 
-Notification = get_model('communication', 'Notification')
+Notification = get_model("communication", "Notification")
 
 
 def notifications(request):
     ctx = {}
-    if getattr(request, 'user', None) and request.user.is_authenticated:
+    if getattr(request, "user", None) and request.user.is_authenticated:
         num_unread = Notification.objects.filter(
-            recipient=request.user, date_read=None).count()
-        ctx['num_unread_notifications'] = num_unread
+            recipient=request.user, date_read=None
+        ).count()
+        ctx["num_unread_notifications"] = num_unread
     return ctx

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

@@ -10,47 +10,47 @@ from oscar.core.loading import get_class, get_model
 from oscar.core.utils import redirect_to_referrer
 from oscar.views.generic import BulkEditMixin
 
-PageTitleMixin = get_class('customer.mixins', 'PageTitleMixin')
-Notification = get_model('communication', 'Notification')
+PageTitleMixin = get_class("customer.mixins", "PageTitleMixin")
+Notification = get_model("communication", "Notification")
 
 
 class NotificationListView(PageTitleMixin, generic.ListView):
     model = Notification
-    template_name = 'oscar/communication/notifications/list.html'
-    context_object_name = 'notifications'
+    template_name = "oscar/communication/notifications/list.html"
+    context_object_name = "notifications"
     paginate_by = settings.OSCAR_NOTIFICATIONS_PER_PAGE
     page_title = _("Notifications")
-    active_tab = 'notifications'
+    active_tab = "notifications"
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
-        ctx['list_type'] = self.list_type
+        ctx["list_type"] = self.list_type
         return ctx
 
 
 class InboxView(NotificationListView):
-    list_type = 'inbox'
+    list_type = "inbox"
 
     def get_queryset(self):
         return self.model._default_manager.filter(
-            recipient=self.request.user,
-            location=self.model.INBOX)
+            recipient=self.request.user, location=self.model.INBOX
+        )
 
 
 class ArchiveView(NotificationListView):
-    list_type = 'archive'
+    list_type = "archive"
 
     def get_queryset(self):
         return self.model._default_manager.filter(
-            recipient=self.request.user,
-            location=self.model.ARCHIVE)
+            recipient=self.request.user, location=self.model.ARCHIVE
+        )
 
 
 class DetailView(PageTitleMixin, generic.DetailView):
     model = Notification
-    template_name = 'oscar/communication/notifications/detail.html'
-    context_object_name = 'notification'
-    active_tab = 'notifications'
+    template_name = "oscar/communication/notifications/detail.html"
+    context_object_name = "notification"
+    active_tab = "notifications"
 
     def get_object(self, queryset=None):
         obj = super().get_object()
@@ -62,34 +62,32 @@ class DetailView(PageTitleMixin, generic.DetailView):
     def get_page_title(self):
         """Append subject to page title"""
         title = strip_tags(self.object.subject)
-        return '%s: %s' % (_('Notification'), title)
+        return "%s: %s" % (_("Notification"), title)
 
     def get_queryset(self):
-        return self.model._default_manager.filter(
-            recipient=self.request.user)
+        return self.model._default_manager.filter(recipient=self.request.user)
 
 
 class UpdateView(BulkEditMixin, generic.View):
     model = Notification
-    http_method_names = ['post']
-    actions = ('archive', 'delete')
-    checkbox_object_name = 'notification'
+    http_method_names = ["post"]
+    actions = ("archive", "delete")
+    checkbox_object_name = "notification"
 
     def get_object_dict(self, ids):
-        return self.model.objects.filter(
-            recipient=self.request.user).in_bulk(ids)
+        return self.model.objects.filter(recipient=self.request.user).in_bulk(ids)
 
     def get_success_response(self):
-        return redirect_to_referrer(
-            self.request, 'communication:notifications-inbox')
+        return redirect_to_referrer(self.request, "communication:notifications-inbox")
 
     def archive(self, request, notifications):
         for notification in notifications:
             notification.archive()
         msg = ngettext(
-            '%(count)d notification archived',
-            '%(count)d notifications archived', len(notifications)) \
-            % {'count': len(notifications)}
+            "%(count)d notification archived",
+            "%(count)d notifications archived",
+            len(notifications),
+        ) % {"count": len(notifications)}
         messages.success(request, msg)
         return self.get_success_response()
 
@@ -97,8 +95,9 @@ class UpdateView(BulkEditMixin, generic.View):
         for notification in notifications:
             notification.delete()
         msg = ngettext(
-            '%(count)d notification deleted',
-            '%(count)d notifications deleted', len(notifications)) \
-            % {'count': len(notifications)}
+            "%(count)d notification deleted",
+            "%(count)d notifications deleted",
+            len(notifications),
+        ) % {"count": len(notifications)}
         messages.success(request, msg)
         return self.get_success_response()

src/oscar/apps/communication/utils.py

@@ -6,13 +6,12 @@ from django.core.mail import EmailMessage, EmailMultiAlternatives
 
 from oscar.core.loading import get_model
 
-CommunicationEventType = get_model('communication', 'CommunicationEventType')
-Email = get_model('communication', 'Email')
-Notification = get_model('communication', 'Notification')
+CommunicationEventType = get_model("communication", "CommunicationEventType")
+Email = get_model("communication", "Email")
+Notification = get_model("communication", "Notification")
 
 
 class Dispatcher(object):
-
     def __init__(self, logger=None, mail_connection=None):
         if not logger:
             logger = logging.getLogger(__name__)
@@ -27,13 +26,18 @@ class Dispatcher(object):
         """
         Dispatch one-off messages to explicitly specified recipient email.
         """
-        if messages['subject'] and (messages['body'] or messages['html']):
-            return self.send_email_messages(recipient_email, messages, attachments=attachments)
+        if messages["subject"] and (messages["body"] or messages["html"]):
+            return self.send_email_messages(
+                recipient_email, messages, attachments=attachments
+            )
 
     def dispatch_anonymous_messages(self, email, messages, attachments=None):
         dispatched_messages = {}
         if email:
-            dispatched_messages['email'] = self.send_email_messages(email, messages, attachments=attachments), None
+            dispatched_messages["email"] = (
+                self.send_email_messages(email, messages, attachments=attachments),
+                None,
+            )
         return dispatched_messages
 
     def dispatch_user_messages(self, user, messages, attachments=None):
@@ -41,10 +45,12 @@ class Dispatcher(object):
         Send messages to a site user
         """
         dispatched_messages = {}
-        if messages['subject'] and (messages['body'] or messages['html']):
-            dispatched_messages['email'] = self.send_user_email_messages(user, messages, attachments)
-        if messages['sms']:
-            dispatched_messages['sms'] = self.send_text_message(user, messages['sms'])
+        if messages["subject"] and (messages["body"] or messages["html"]):
+            dispatched_messages["email"] = self.send_user_email_messages(
+                user, messages, attachments
+            )
+        if messages["sms"]:
+            dispatched_messages["sms"] = self.send_text_message(user, messages["sms"])
         return dispatched_messages
 
     def notify_user(self, user, subject, **kwargs):
@@ -72,7 +78,7 @@ class Dispatcher(object):
                 email=user.email,
                 subject=email.subject,
                 body_text=email.body,
-                body_html=messages['html'],
+                body_html=messages["html"],
             )
 
     def send_user_email_messages(self, user, messages, attachments=None):
@@ -80,8 +86,10 @@ class Dispatcher(object):
         Send message to the registered user / customer and collect data in database.
         """
         if not user.email:
-            self.logger.warning("Unable to send email messages as user #%d has"
-                                " no email address", user.id)
+            self.logger.warning(
+                "Unable to send email messages as user #%d has no email address",
+                user.id,
+            )
             return None
 
         email = self.send_email_messages(user.email, messages, attachments=attachments)
@@ -91,7 +99,9 @@ class Dispatcher(object):
 
         return email
 
-    def send_email_messages(self, recipient_email, messages, from_email=None, attachments=None):
+    def send_email_messages(
+        self, recipient_email, messages, from_email=None, attachments=None
+    ):
         """
         Send email to recipient, HTML attachment optional.
         """
@@ -100,19 +110,19 @@ class Dispatcher(object):
         content_attachments, file_attachments = self.prepare_attachments(attachments)
 
         # Determine whether we are sending a HTML version too
-        if messages['html']:
+        if messages["html"]:
             email = EmailMultiAlternatives(
-                messages['subject'],
-                messages['body'],
+                messages["subject"],
+                messages["body"],
                 from_email=from_email,
                 to=[recipient_email],
                 attachments=content_attachments,
             )
-            email.attach_alternative(messages['html'], "text/html")
+            email.attach_alternative(messages["html"], "text/html")
         else:
             email = EmailMessage(
-                messages['subject'],
-                messages['body'],
+                messages["subject"],
+                messages["body"],
                 from_email=from_email,
                 to=[recipient_email],
                 attachments=content_attachments,
@@ -120,7 +130,7 @@ class Dispatcher(object):
         for attachment in file_attachments:
             email.attach_file(attachment)
 
-        self.logger.info("Sending email to %s" % recipient_email)
+        self.logger.info("Sending email to %s", recipient_email)
 
         if self.mail_connection:
             self.mail_connection.send_messages([email])

src/oscar/apps/customer/__init__.py

@@ -1 +1 @@
-default_app_config = 'oscar.apps.customer.apps.CustomerConfig'
+default_app_config = "oscar.apps.customer.apps.CustomerConfig"

src/oscar/apps/customer/abstract_models.py

@@ -10,7 +10,6 @@ from oscar.core.compat import AUTH_USER_MODEL
 
 
 class UserManager(auth_models.BaseUserManager):
-
     def create_user(self, email, password=None, **extra_fields):
         """
         Creates and saves a User with the given email and
@@ -18,12 +17,17 @@ class UserManager(auth_models.BaseUserManager):
         """
         now = timezone.now()
         if not email:
-            raise ValueError('The given email must be set')
+            raise ValueError("The given email must be set")
         email = UserManager.normalize_email(email)
         user = self.model(
-            email=email, is_staff=False, is_active=True,
+            email=email,
+            is_staff=False,
+            is_active=True,
             is_superuser=False,
-            last_login=now, date_joined=now, **extra_fields)
+            last_login=now,
+            date_joined=now,
+            **extra_fields
+        )
 
         user.set_password(password)
         user.save(using=self._db)
@@ -38,38 +42,40 @@ class UserManager(auth_models.BaseUserManager):
         return u
 
 
-class AbstractUser(auth_models.AbstractBaseUser,
-                   auth_models.PermissionsMixin):
+class AbstractUser(auth_models.AbstractBaseUser, auth_models.PermissionsMixin):
     """
     An abstract base user suitable for use in Oscar projects.
 
     This is basically a copy of the core AbstractUser model but without a
     username field
     """
-    email = models.EmailField(_('email address'), unique=True)
-    first_name = models.CharField(
-        _('First name'), max_length=255, blank=True)
-    last_name = models.CharField(
-        _('Last name'), max_length=255, blank=True)
+
+    email = models.EmailField(_("email address"), unique=True)
+    first_name = models.CharField(_("First name"), max_length=255, blank=True)
+    last_name = models.CharField(_("Last name"), max_length=255, blank=True)
     is_staff = models.BooleanField(
-        _('Staff status'), default=False,
-        help_text=_('Designates whether the user can log into this admin '
-                    'site.'))
+        _("Staff status"),
+        default=False,
+        help_text=_("Designates whether the user can log into this admin site."),
+    )
     is_active = models.BooleanField(
-        _('Active'), default=True,
-        help_text=_('Designates whether this user should be treated as '
-                    'active. Unselect this instead of deleting accounts.'))
-    date_joined = models.DateTimeField(_('date joined'),
-                                       default=timezone.now)
+        _("Active"),
+        default=True,
+        help_text=_(
+            "Designates whether this user should be treated as "
+            "active. Unselect this instead of deleting accounts."
+        ),
+    )
+    date_joined = models.DateTimeField(_("date joined"), default=timezone.now)
 
     objects = UserManager()
 
-    USERNAME_FIELD = 'email'
+    USERNAME_FIELD = "email"
 
     class Meta:
         abstract = True
-        verbose_name = _('User')
-        verbose_name_plural = _('Users')
+        verbose_name = _("User")
+        verbose_name_plural = _("Users")
 
     def clean(self):
         super().clean()
@@ -79,7 +85,7 @@ class AbstractUser(auth_models.AbstractBaseUser,
         """
         Return the first_name plus the last_name, with a space in between.
         """
-        full_name = '%s %s' % (self.first_name, self.last_name)
+        full_name = "%s %s" % (self.first_name, self.last_name)
         return full_name.strip()
 
     def get_short_name(self):
@@ -99,10 +105,12 @@ class AbstractUser(auth_models.AbstractBaseUser,
         Transfer any active alerts linked to a user's email address to the
         newly registered user.
         """
+        # pylint: disable=no-member
         ProductAlert = self.alerts.model
         alerts = ProductAlert.objects.filter(
-            email=self.email, status=ProductAlert.ACTIVE)
-        alerts.update(user=self, key='', email='')
+            email=self.email, status=ProductAlert.ACTIVE
+        )
+        alerts.update(user=self, key="", email="")
 
     def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
@@ -117,9 +125,8 @@ class AbstractProductAlert(models.Model):
     """
     An alert for when a product comes back in stock
     """
-    product = models.ForeignKey(
-        'catalogue.Product',
-        on_delete=models.CASCADE)
+
+    product = models.ForeignKey("catalogue.Product", on_delete=models.CASCADE)
 
     # A user is only required if the notification is created by a
     # registered user, anonymous users will only have an email address
@@ -130,7 +137,8 @@ class AbstractProductAlert(models.Model):
         null=True,
         on_delete=models.CASCADE,
         related_name="alerts",
-        verbose_name=_('User'))
+        verbose_name=_("User"),
+    )
     email = models.EmailField(_("Email"), db_index=True, blank=True)
 
     # This key are used to confirm and cancel alerts for anon users
@@ -143,29 +151,34 @@ class AbstractProductAlert(models.Model):
     # the first time and can be used to confirm and unsubscribe the
     # notifications.
     UNCONFIRMED, ACTIVE, CANCELLED, CLOSED = (
-        'Unconfirmed', 'Active', 'Cancelled', 'Closed')
+        "Unconfirmed",
+        "Active",
+        "Cancelled",
+        "Closed",
+    )
     STATUS_CHOICES = (
-        (UNCONFIRMED, _('Not yet confirmed')),
-        (ACTIVE, _('Active')),
-        (CANCELLED, _('Cancelled')),
-        (CLOSED, _('Closed')),
+        (UNCONFIRMED, _("Not yet confirmed")),
+        (ACTIVE, _("Active")),
+        (CANCELLED, _("Cancelled")),
+        (CLOSED, _("Closed")),
     )
-    status = models.CharField(_("Status"), max_length=20,
-                              choices=STATUS_CHOICES, default=ACTIVE)
-
-    date_created = models.DateTimeField(_("Date created"), auto_now_add=True, db_index=True)
-    date_confirmed = models.DateTimeField(_("Date confirmed"), blank=True,
-                                          null=True)
-    date_cancelled = models.DateTimeField(_("Date cancelled"), blank=True,
-                                          null=True)
+    status = models.CharField(
+        _("Status"), max_length=20, choices=STATUS_CHOICES, default=ACTIVE
+    )
+
+    date_created = models.DateTimeField(
+        _("Date created"), auto_now_add=True, db_index=True
+    )
+    date_confirmed = models.DateTimeField(_("Date confirmed"), blank=True, null=True)
+    date_cancelled = models.DateTimeField(_("Date cancelled"), blank=True, null=True)
     date_closed = models.DateTimeField(_("Date closed"), blank=True, null=True)
 
     class Meta:
         abstract = True
-        app_label = 'customer'
-        ordering = ['-date_created']
-        verbose_name = _('Product alert')
-        verbose_name_plural = _('Product alerts')
+        app_label = "customer"
+        ordering = ["-date_created"]
+        verbose_name = _("Product alert")
+        verbose_name_plural = _("Product alerts")
 
     @property
     def is_anonymous(self):
@@ -191,18 +204,21 @@ class AbstractProductAlert(models.Model):
         self.status = self.ACTIVE
         self.date_confirmed = timezone.now()
         self.save()
+
     confirm.alters_data = True
 
     def cancel(self):
         self.status = self.CANCELLED
         self.date_cancelled = timezone.now()
         self.save()
+
     cancel.alters_data = True
 
     def close(self):
         self.status = self.CLOSED
         self.date_closed = timezone.now()
         self.save()
+
     close.alters_data = True
 
     def get_email_address(self):
@@ -219,8 +235,7 @@ class AbstractProductAlert(models.Model):
         # calls save, and doesn't call the methods cancel(), confirm() etc).
         if self.status == self.CANCELLED and self.date_cancelled is None:
             self.date_cancelled = timezone.now()
-        if not self.user and self.status == self.ACTIVE \
-                and self.date_confirmed is None:
+        if not self.user and self.status == self.ACTIVE and self.date_confirmed is None:
             self.date_confirmed = timezone.now()
         if self.status == self.CLOSED and self.date_closed is None:
             self.date_closed = timezone.now()
@@ -228,10 +243,12 @@ class AbstractProductAlert(models.Model):
         return super().save(*args, **kwargs)
 
     def get_random_key(self):
-        return get_random_string(length=40, allowed_chars='abcdefghijklmnopqrstuvwxyz0123456789')
+        return get_random_string(
+            length=40, allowed_chars="abcdefghijklmnopqrstuvwxyz0123456789"
+        )
 
     def get_confirm_url(self):
-        return reverse('customer:alerts-confirm', kwargs={'key': self.key})
+        return reverse("customer:alerts-confirm", kwargs={"key": self.key})
 
     def get_cancel_url(self):
-        return reverse('customer:alerts-cancel-by-key', kwargs={'key': self.key})
+        return reverse("customer:alerts-cancel-by-key", kwargs={"key": self.key})

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

@@ -3,15 +3,16 @@ from django.db.models.signals import post_save
 
 from oscar.core.loading import get_class, get_model
 
-AlertsDispatcher = get_class('customer.alerts.utils', 'AlertsDispatcher')
+AlertsDispatcher = get_class("customer.alerts.utils", "AlertsDispatcher")
 
 
+# pylint: disable=unused-argument
 def send_product_alerts(sender, instance, created, **kwargs):
-    if kwargs.get('raw', False):
+    if kwargs.get("raw", False):
         return
     AlertsDispatcher().send_product_alert_email_for_user(instance.product)
 
 
 if settings.OSCAR_EAGER_ALERTS:
-    StockRecord = get_model('partner', 'StockRecord')
+    StockRecord = get_model("partner", "StockRecord")
     post_save.connect(send_product_alerts, sender=StockRecord)

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

@@ -5,12 +5,12 @@ from django.template import loader
 
 from oscar.core.loading import get_class, get_model
 
-ProductAlert = get_model('customer', 'ProductAlert')
-Product = get_model('catalogue', 'Product')
-Dispatcher = get_class('communication.utils', 'Dispatcher')
-Selector = get_class('partner.strategy', 'Selector')
+ProductAlert = get_model("customer", "ProductAlert")
+Product = get_model("catalogue", "Product")
+Dispatcher = get_class("communication.utils", "Dispatcher")
+Selector = get_class("partner.strategy", "Selector")
 
-alerts_logger = logging.getLogger('oscar.alerts')
+alerts_logger = logging.getLogger("oscar.alerts")
 
 
 class AlertsDispatcher:
@@ -20,8 +20,8 @@ class AlertsDispatcher:
     """
 
     # Event codes
-    PRODUCT_ALERT_EVENT_CODE = 'PRODUCT_ALERT'
-    PRODUCT_ALERT_CONFIRMATION_EVENT_CODE = 'PRODUCT_ALERT_CONFIRMATION'
+    PRODUCT_ALERT_EVENT_CODE = "PRODUCT_ALERT"
+    PRODUCT_ALERT_CONFIRMATION_EVENT_CODE = "PRODUCT_ALERT_CONFIRMATION"
 
     def __init__(self, logger=None, mail_connection=None):
         self.dispatcher = Dispatcher(
@@ -30,7 +30,11 @@ class AlertsDispatcher:
         )
 
     def get_queryset(self):
-        return Product.objects.browsable().filter(productalert__status=ProductAlert.ACTIVE).distinct()
+        return (
+            Product.objects.browsable()
+            .filter(productalert__status=ProductAlert.ACTIVE)
+            .distinct()
+        )
 
     def send_alerts(self):
         """
@@ -39,11 +43,13 @@ class AlertsDispatcher:
         available to buy.
         """
         products = self.get_queryset()
-        self.dispatcher.logger.info("Found %d products with active alerts", products.count())
+        self.dispatcher.logger.info(
+            "Found %d products with active alerts", products.count()
+        )
         for product in products:
             self.send_product_alert_email_for_user(product)
 
-    def send_product_alert_email_for_user(self, product):  # noqa: C901 too complex
+    def send_product_alert_email_for_user(self, product):
         """
         Check for notifications for this product and send email to users
         if the product is back in stock. Add a little 'hurry' note if the
@@ -64,8 +70,8 @@ class AlertsDispatcher:
         if num_stockrecords == 1:
             num_in_stock = stockrecords[0].num_in_stock
         else:
-            result = stockrecords.aggregate(max_in_stock=Max('num_in_stock'))
-            num_in_stock = result['max_in_stock']
+            result = stockrecords.aggregate(max_in_stock=Max("num_in_stock"))
+            num_in_stock = result["max_in_stock"]
 
         # 'hurry_mode' is false if 'num_in_stock' is None
         hurry_mode = num_in_stock is not None and alerts.count() > num_in_stock
@@ -82,17 +88,19 @@ class AlertsDispatcher:
                 continue
 
             extra_context = {
-                'alert': alert,
-                'hurry': hurry_mode,
+                "alert": alert,
+                "hurry": hurry_mode,
             }
             if alert.user:
                 # Send a site notification
                 num_notifications += 1
                 self.notify_user_about_product_alert(alert.user, extra_context)
 
-            messages = self.dispatcher.get_messages(self.PRODUCT_ALERT_EVENT_CODE, extra_context)
+            messages = self.dispatcher.get_messages(
+                self.PRODUCT_ALERT_EVENT_CODE, extra_context
+            )
 
-            if messages and messages['body']:
+            if messages and messages["body"]:
                 if alert.user:
                     user_messages_to_send.append((alert.user, messages))
                 else:
@@ -107,7 +115,8 @@ class AlertsDispatcher:
 
         self.dispatcher.logger.info(
             "Sent %d notifications and %d messages",
-            num_notifications, len(messages_to_send) + len(user_messages_to_send)
+            num_notifications,
+            len(messages_to_send) + len(user_messages_to_send),
         )
 
     def send_product_alert_confirmation_email_for_user(self, alert, extra_context=None):
@@ -115,15 +124,17 @@ class AlertsDispatcher:
         Send an alert confirmation email.
         """
         if extra_context is None:
-            extra_context = {'alert': alert}
-        messages = self.dispatcher.get_messages(self.PRODUCT_ALERT_CONFIRMATION_EVENT_CODE, extra_context)
+            extra_context = {"alert": alert}
+        messages = self.dispatcher.get_messages(
+            self.PRODUCT_ALERT_CONFIRMATION_EVENT_CODE, extra_context
+        )
         self.dispatcher.dispatch_direct_messages(alert.email, messages)
 
     def notify_user_about_product_alert(self, user, context):
-        subj_tpl = loader.get_template('oscar/customer/alerts/message_subject.html')
-        message_tpl = loader.get_template('oscar/customer/alerts/message.html')
+        subj_tpl = loader.get_template("oscar/customer/alerts/message_subject.html")
+        message_tpl = loader.get_template("oscar/customer/alerts/message.html")
         self.dispatcher.notify_user(
             user,
             subj_tpl.render(context).strip(),
-            body=message_tpl.render(context).strip()
+            body=message_tpl.render(context).strip(),
         )

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

@@ -1,3 +1,4 @@
+# pylint: disable=attribute-defined-outside-init
 from django import http
 from django.contrib import messages
 from django.http import Http404
@@ -7,19 +8,19 @@ from django.views import generic
 
 from oscar.core.loading import get_class, get_model
 
-Product = get_model('catalogue', 'Product')
-ProductAlert = get_model('customer', 'ProductAlert')
-PageTitleMixin = get_class('customer.mixins', 'PageTitleMixin')
-ProductAlertForm = get_class('customer.forms', 'ProductAlertForm')
-AlertsDispatcher = get_class('customer.alerts.utils', 'AlertsDispatcher')
+Product = get_model("catalogue", "Product")
+ProductAlert = get_model("customer", "ProductAlert")
+PageTitleMixin = get_class("customer.mixins", "PageTitleMixin")
+ProductAlertForm = get_class("customer.forms", "ProductAlertForm")
+AlertsDispatcher = get_class("customer.alerts.utils", "AlertsDispatcher")
 
 
 class ProductAlertListView(PageTitleMixin, generic.ListView):
     model = ProductAlert
-    template_name = 'oscar/customer/alerts/alert_list.html'
-    context_object_name = 'alerts'
-    page_title = _('Product Alerts')
-    active_tab = 'alerts'
+    template_name = "oscar/customer/alerts/alert_list.html"
+    context_object_name = "alerts"
+    page_title = _("Product Alerts")
+    active_tab = "alerts"
 
     def get_queryset(self):
         return ProductAlert.objects.select_related().filter(
@@ -33,42 +34,44 @@ class ProductAlertCreateView(generic.CreateView):
     View to create a new product alert based on a registered user
     or an email address provided by an anonymous user.
     """
+
     model = ProductAlert
     form_class = ProductAlertForm
-    template_name = 'oscar/customer/alerts/form.html'
+    template_name = "oscar/customer/alerts/form.html"
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
-        ctx['product'] = self.product
-        ctx['alert_form'] = ctx.pop('form')
+        ctx["product"] = self.product
+        ctx["alert_form"] = ctx.pop("form")
         return ctx
 
     def get(self, request, *args, **kwargs):
-        product = get_object_or_404(Product, pk=self.kwargs['pk'])
+        product = get_object_or_404(Product, pk=self.kwargs["pk"])
         return http.HttpResponseRedirect(product.get_absolute_url())
 
     def post(self, request, *args, **kwargs):
-        self.product = get_object_or_404(Product, pk=self.kwargs['pk'])
+        self.product = get_object_or_404(Product, pk=self.kwargs["pk"])
         return super().post(request, *args, **kwargs)
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['user'] = self.request.user
-        kwargs['product'] = self.product
+        kwargs["user"] = self.request.user
+        kwargs["product"] = self.product
         return kwargs
 
     def form_valid(self, form):
         response = super().form_valid(form)
         if self.object.is_anonymous:
-            AlertsDispatcher().send_product_alert_confirmation_email_for_user(self.object)
+            AlertsDispatcher().send_product_alert_confirmation_email_for_user(
+                self.object
+            )
         return response
 
     def get_success_url(self):
         if self.object.user:
             msg = _("An alert has been created")
         else:
-            msg = _("A confirmation email has been sent to %s") \
-                % self.object.email
+            msg = _("A confirmation email has been sent to %s") % self.object.email
         messages.success(self.request, msg)
         return self.object.product.get_absolute_url()
 
@@ -77,7 +80,7 @@ class ProductAlertConfirmView(generic.RedirectView):
     permanent = False
 
     def get(self, request, *args, **kwargs):
-        self.alert = get_object_or_404(ProductAlert, key=kwargs['key'])
+        self.alert = get_object_or_404(ProductAlert, key=kwargs["key"])
         self.update_alert()
         return super().get(request, *args, **kwargs)
 
@@ -86,10 +89,9 @@ class ProductAlertConfirmView(generic.RedirectView):
             self.alert.confirm()
             messages.success(self.request, _("Your stock alert is now active"))
         else:
-            messages.error(self.request, _("Your stock alert cannot be"
-                                           " confirmed"))
+            messages.error(self.request, _("Your stock alert cannot be confirmed"))
 
-    def get_redirect_url(self, **kwargs):
+    def get_redirect_url(self, *args, **kwargs):
         return self.alert.product.get_absolute_url()
 
 
@@ -102,15 +104,16 @@ class ProductAlertCancelView(generic.RedirectView):
     Specifying the redirect url is possible by supplying a 'next' GET
     parameter.  It defaults to showing the associated product page.
     """
+
     permanent = False
 
     def get(self, request, *args, **kwargs):
-        if 'key' in kwargs:
-            self.alert = get_object_or_404(ProductAlert, key=kwargs['key'])
-        elif 'pk' in kwargs and request.user.is_authenticated:
-            self.alert = get_object_or_404(ProductAlert,
-                                           user=self.request.user,
-                                           pk=kwargs['pk'])
+        if "key" in kwargs:
+            self.alert = get_object_or_404(ProductAlert, key=kwargs["key"])
+        elif "pk" in kwargs and request.user.is_authenticated:
+            self.alert = get_object_or_404(
+                ProductAlert, user=self.request.user, pk=kwargs["pk"]
+            )
         else:
             raise Http404
         self.update_alert()
@@ -119,12 +122,9 @@ class ProductAlertCancelView(generic.RedirectView):
     def update_alert(self):
         if self.alert.can_be_cancelled:
             self.alert.cancel()
-            messages.success(self.request, _("Your stock alert has been"
-                                             " cancelled"))
+            messages.success(self.request, _("Your stock alert has been cancelled"))
         else:
-            messages.error(self.request, _("Your stock alert cannot be"
-                                           " cancelled"))
+            messages.error(self.request, _("Your stock alert cannot be cancelled"))
 
-    def get_redirect_url(self, **kwargs):
-        return self.request.GET.get('next',
-                                    self.alert.product.get_absolute_url())
+    def get_redirect_url(self, *args, **kwargs):
+        return self.request.GET.get("next", self.alert.product.get_absolute_url())

src/oscar/apps/customer/apps.py

@@ -8,193 +8,296 @@ from oscar.core.loading import get_class
 
 
 class CustomerConfig(OscarConfig):
-    label = 'customer'
-    name = 'oscar.apps.customer'
-    verbose_name = _('Customer')
+    label = "customer"
+    name = "oscar.apps.customer"
+    verbose_name = _("Customer")
 
-    namespace = 'customer'
+    namespace = "customer"
 
+    # pylint: disable=attribute-defined-outside-init, reimported, unused-import
     def ready(self):
-        from . import receivers  # noqa
-        from .alerts import receivers  # noqa
+        from . import receivers
+        from .alerts import receivers
 
-        self.summary_view = get_class('customer.views', 'AccountSummaryView')
-        self.order_history_view = get_class('customer.views', 'OrderHistoryView')
-        self.order_detail_view = get_class('customer.views', 'OrderDetailView')
-        self.anon_order_detail_view = get_class('customer.views',
-                                                'AnonymousOrderDetailView')
-        self.order_line_view = get_class('customer.views', 'OrderLineView')
+        self.summary_view = get_class("customer.views", "AccountSummaryView")
+        self.order_history_view = get_class("customer.views", "OrderHistoryView")
+        self.order_detail_view = get_class("customer.views", "OrderDetailView")
+        self.anon_order_detail_view = get_class(
+            "customer.views", "AnonymousOrderDetailView"
+        )
+        self.order_line_view = get_class("customer.views", "OrderLineView")
 
-        self.address_list_view = get_class('customer.views', 'AddressListView')
-        self.address_create_view = get_class('customer.views', 'AddressCreateView')
-        self.address_update_view = get_class('customer.views', 'AddressUpdateView')
-        self.address_delete_view = get_class('customer.views', 'AddressDeleteView')
-        self.address_change_status_view = get_class('customer.views',
-                                                    'AddressChangeStatusView')
+        self.address_list_view = get_class("customer.views", "AddressListView")
+        self.address_create_view = get_class("customer.views", "AddressCreateView")
+        self.address_update_view = get_class("customer.views", "AddressUpdateView")
+        self.address_delete_view = get_class("customer.views", "AddressDeleteView")
+        self.address_change_status_view = get_class(
+            "customer.views", "AddressChangeStatusView"
+        )
 
-        self.email_list_view = get_class('customer.views', 'EmailHistoryView')
-        self.email_detail_view = get_class('customer.views', 'EmailDetailView')
-        self.login_view = get_class('customer.views', 'AccountAuthView')
-        self.logout_view = get_class('customer.views', 'LogoutView')
-        self.register_view = get_class('customer.views', 'AccountRegistrationView')
-        self.profile_view = get_class('customer.views', 'ProfileView')
-        self.profile_update_view = get_class('customer.views', 'ProfileUpdateView')
-        self.profile_delete_view = get_class('customer.views', 'ProfileDeleteView')
-        self.change_password_view = get_class('customer.views', 'ChangePasswordView')
+        self.email_list_view = get_class("customer.views", "EmailHistoryView")
+        self.email_detail_view = get_class("customer.views", "EmailDetailView")
+        self.login_view = get_class("customer.views", "AccountAuthView")
+        self.logout_view = get_class("customer.views", "LogoutView")
+        self.register_view = get_class("customer.views", "AccountRegistrationView")
+        self.profile_view = get_class("customer.views", "ProfileView")
+        self.profile_update_view = get_class("customer.views", "ProfileUpdateView")
+        self.profile_delete_view = get_class("customer.views", "ProfileDeleteView")
+        self.change_password_view = get_class("customer.views", "ChangePasswordView")
 
-        self.notification_inbox_view = get_class('communication.notifications.views',
-                                                 'InboxView')
-        self.notification_archive_view = get_class('communication.notifications.views',
-                                                   'ArchiveView')
-        self.notification_update_view = get_class('communication.notifications.views',
-                                                  'UpdateView')
-        self.notification_detail_view = get_class('communication.notifications.views',
-                                                  'DetailView')
+        self.notification_inbox_view = get_class(
+            "communication.notifications.views", "InboxView"
+        )
+        self.notification_archive_view = get_class(
+            "communication.notifications.views", "ArchiveView"
+        )
+        self.notification_update_view = get_class(
+            "communication.notifications.views", "UpdateView"
+        )
+        self.notification_detail_view = get_class(
+            "communication.notifications.views", "DetailView"
+        )
 
-        self.alert_list_view = get_class('customer.alerts.views',
-                                         'ProductAlertListView')
-        self.alert_create_view = get_class('customer.alerts.views',
-                                           'ProductAlertCreateView')
-        self.alert_confirm_view = get_class('customer.alerts.views',
-                                            'ProductAlertConfirmView')
-        self.alert_cancel_view = get_class('customer.alerts.views',
-                                           'ProductAlertCancelView')
+        self.alert_list_view = get_class(
+            "customer.alerts.views", "ProductAlertListView"
+        )
+        self.alert_create_view = get_class(
+            "customer.alerts.views", "ProductAlertCreateView"
+        )
+        self.alert_confirm_view = get_class(
+            "customer.alerts.views", "ProductAlertConfirmView"
+        )
+        self.alert_cancel_view = get_class(
+            "customer.alerts.views", "ProductAlertCancelView"
+        )
 
-        self.wishlists_add_product_view = get_class('customer.wishlists.views',
-                                                    'WishListAddProduct')
-        self.wishlists_list_view = get_class('customer.wishlists.views',
-                                             'WishListListView')
-        self.wishlists_detail_view = get_class('customer.wishlists.views',
-                                               'WishListDetailView')
-        self.wishlists_create_view = get_class('customer.wishlists.views',
-                                               'WishListCreateView')
-        self.wishlists_create_with_product_view = get_class('customer.wishlists.views',
-                                                            'WishListCreateView')
-        self.wishlists_update_view = get_class('customer.wishlists.views',
-                                               'WishListUpdateView')
-        self.wishlists_delete_view = get_class('customer.wishlists.views',
-                                               'WishListDeleteView')
-        self.wishlists_remove_product_view = get_class('customer.wishlists.views',
-                                                       'WishListRemoveProduct')
+        self.wishlists_add_product_view = get_class(
+            "customer.wishlists.views", "WishListAddProduct"
+        )
+        self.wishlists_list_view = get_class(
+            "customer.wishlists.views", "WishListListView"
+        )
+        self.wishlists_detail_view = get_class(
+            "customer.wishlists.views", "WishListDetailView"
+        )
+        self.wishlists_create_view = get_class(
+            "customer.wishlists.views", "WishListCreateView"
+        )
+        self.wishlists_create_with_product_view = get_class(
+            "customer.wishlists.views", "WishListCreateView"
+        )
+        self.wishlists_update_view = get_class(
+            "customer.wishlists.views", "WishListUpdateView"
+        )
+        self.wishlists_delete_view = get_class(
+            "customer.wishlists.views", "WishListDeleteView"
+        )
+        self.wishlists_remove_product_view = get_class(
+            "customer.wishlists.views", "WishListRemoveProduct"
+        )
         self.wishlists_move_product_to_another_view = get_class(
-            'customer.wishlists.views', 'WishListMoveProductToAnotherWishList')
+            "customer.wishlists.views", "WishListMoveProductToAnotherWishList"
+        )
 
     def get_urls(self):
         urls = [
             # Login, logout and register doesn't require login
-            path('login/', self.login_view.as_view(), name='login'),
-            path('logout/', self.logout_view.as_view(), name='logout'),
-            path('register/', self.register_view.as_view(), name='register'),
-            path('', login_required(self.summary_view.as_view()), name='summary'),
-            path('change-password/', login_required(self.change_password_view.as_view()), name='change-password'),
-
+            path("login/", self.login_view.as_view(), name="login"),
+            path("logout/", self.logout_view.as_view(), name="logout"),
+            path("register/", self.register_view.as_view(), name="register"),
+            path("", login_required(self.summary_view.as_view()), name="summary"),
+            path(
+                "change-password/",
+                login_required(self.change_password_view.as_view()),
+                name="change-password",
+            ),
             # Profile
-            path('profile/', login_required(self.profile_view.as_view()), name='profile-view'),
-            path('profile/edit/', login_required(self.profile_update_view.as_view()), name='profile-update'),
-            path('profile/delete/', login_required(self.profile_delete_view.as_view()), name='profile-delete'),
-
+            path(
+                "profile/",
+                login_required(self.profile_view.as_view()),
+                name="profile-view",
+            ),
+            path(
+                "profile/edit/",
+                login_required(self.profile_update_view.as_view()),
+                name="profile-update",
+            ),
+            path(
+                "profile/delete/",
+                login_required(self.profile_delete_view.as_view()),
+                name="profile-delete",
+            ),
             # Order history
-            path('orders/', login_required(self.order_history_view.as_view()), name='order-list'),
+            path(
+                "orders/",
+                login_required(self.order_history_view.as_view()),
+                name="order-list",
+            ),
             re_path(
-                r'^order-status/(?P<order_number>[\w-]*)/(?P<hash>[A-z0-9-_=:]+)/$',
-                self.anon_order_detail_view.as_view(), name='anon-order'
+                r"^order-status/(?P<order_number>[\w-]*)/(?P<hash>[A-z0-9-_=:]+)/$",
+                self.anon_order_detail_view.as_view(),
+                name="anon-order",
             ),
-            path('orders/<str:order_number>/', login_required(self.order_detail_view.as_view()), name='order'),
             path(
-                'orders/<str:order_number>/<int:line_id>/',
+                "orders/<str:order_number>/",
+                login_required(self.order_detail_view.as_view()),
+                name="order",
+            ),
+            path(
+                "orders/<str:order_number>/<int:line_id>/",
                 login_required(self.order_line_view.as_view()),
-                name='order-line'),
-
+                name="order-line",
+            ),
             # Address book
-            path('addresses/', login_required(self.address_list_view.as_view()), name='address-list'),
-            path('addresses/add/', login_required(self.address_create_view.as_view()), name='address-create'),
-            path('addresses/<int:pk>/', login_required(self.address_update_view.as_view()), name='address-detail'),
             path(
-                'addresses/<int:pk>/delete/',
+                "addresses/",
+                login_required(self.address_list_view.as_view()),
+                name="address-list",
+            ),
+            path(
+                "addresses/add/",
+                login_required(self.address_create_view.as_view()),
+                name="address-create",
+            ),
+            path(
+                "addresses/<int:pk>/",
+                login_required(self.address_update_view.as_view()),
+                name="address-detail",
+            ),
+            path(
+                "addresses/<int:pk>/delete/",
                 login_required(self.address_delete_view.as_view()),
-                name='address-delete'),
+                name="address-delete",
+            ),
             re_path(
-                r'^addresses/(?P<pk>\d+)/(?P<action>default_for_(billing|shipping))/$',
+                r"^addresses/(?P<pk>\d+)/(?P<action>default_for_(billing|shipping))/$",
                 login_required(self.address_change_status_view.as_view()),
-                name='address-change-status'),
-
+                name="address-change-status",
+            ),
             # Email history
-            path('emails/', login_required(self.email_list_view.as_view()), name='email-list'),
-            path('emails/<int:email_id>/', login_required(self.email_detail_view.as_view()), name='email-detail'),
-
+            path(
+                "emails/",
+                login_required(self.email_list_view.as_view()),
+                name="email-list",
+            ),
+            path(
+                "emails/<int:email_id>/",
+                login_required(self.email_detail_view.as_view()),
+                name="email-detail",
+            ),
             # Notifications
             # Redirect to notification inbox
             path(
-                'notifications/', generic.RedirectView.as_view(url='/accounts/notifications/inbox/', permanent=False)),
+                "notifications/",
+                generic.RedirectView.as_view(
+                    url="/accounts/notifications/inbox/", permanent=False
+                ),
+            ),
             path(
-                'notifications/inbox/',
+                "notifications/inbox/",
                 login_required(self.notification_inbox_view.as_view()),
-                name='notifications-inbox'),
+                name="notifications-inbox",
+            ),
             path(
-                'notifications/archive/',
+                "notifications/archive/",
                 login_required(self.notification_archive_view.as_view()),
-                name='notifications-archive'),
+                name="notifications-archive",
+            ),
             path(
-                'notifications/update/',
+                "notifications/update/",
                 login_required(self.notification_update_view.as_view()),
-                name='notifications-update'),
+                name="notifications-update",
+            ),
             path(
-                'notifications/<int:pk>/',
+                "notifications/<int:pk>/",
                 login_required(self.notification_detail_view.as_view()),
-                name='notifications-detail'),
-
+                name="notifications-detail",
+            ),
             # Alerts
             # Alerts can be setup by anonymous users: some views do not
             # require login
-            path('alerts/', login_required(self.alert_list_view.as_view()), name='alerts-list'),
-            path('alerts/create/<int:pk>/', self.alert_create_view.as_view(), name='alert-create'),
-            path('alerts/confirm/<str:key>/', self.alert_confirm_view.as_view(), name='alerts-confirm'),
-            path('alerts/cancel/key/<str:key>/', self.alert_cancel_view.as_view(), name='alerts-cancel-by-key'),
             path(
-                'alerts/cancel/<int:pk>/',
+                "alerts/",
+                login_required(self.alert_list_view.as_view()),
+                name="alerts-list",
+            ),
+            path(
+                "alerts/create/<int:pk>/",
+                self.alert_create_view.as_view(),
+                name="alert-create",
+            ),
+            path(
+                "alerts/confirm/<str:key>/",
+                self.alert_confirm_view.as_view(),
+                name="alerts-confirm",
+            ),
+            path(
+                "alerts/cancel/key/<str:key>/",
+                self.alert_cancel_view.as_view(),
+                name="alerts-cancel-by-key",
+            ),
+            path(
+                "alerts/cancel/<int:pk>/",
                 login_required(self.alert_cancel_view.as_view()),
-                name='alerts-cancel-by-pk'),
-
+                name="alerts-cancel-by-pk",
+            ),
             # Wishlists
-            path('wishlists/', login_required(self.wishlists_list_view.as_view()), name='wishlists-list'),
             path(
-                'wishlists/add/<int:product_pk>/',
+                "wishlists/",
+                login_required(self.wishlists_list_view.as_view()),
+                name="wishlists-list",
+            ),
+            path(
+                "wishlists/add/<int:product_pk>/",
                 login_required(self.wishlists_add_product_view.as_view()),
-                name='wishlists-add-product'),
+                name="wishlists-add-product",
+            ),
             path(
-                'wishlists/<str:key>/add/<int:product_pk>/',
+                "wishlists/<str:key>/add/<int:product_pk>/",
                 login_required(self.wishlists_add_product_view.as_view()),
-                name='wishlists-add-product'),
+                name="wishlists-add-product",
+            ),
             path(
-                'wishlists/create/',
+                "wishlists/create/",
                 login_required(self.wishlists_create_view.as_view()),
-                name='wishlists-create'),
+                name="wishlists-create",
+            ),
             path(
-                'wishlists/create/with-product/<int:product_pk>/',
+                "wishlists/create/with-product/<int:product_pk>/",
                 login_required(self.wishlists_create_view.as_view()),
-                name='wishlists-create-with-product'),
+                name="wishlists-create-with-product",
+            ),
             # Wishlists can be publicly shared, no login required
-            path('wishlists/<str:key>/', self.wishlists_detail_view.as_view(), name='wishlists-detail'),
             path(
-                'wishlists/<str:key>/update/',
+                "wishlists/<str:key>/",
+                self.wishlists_detail_view.as_view(),
+                name="wishlists-detail",
+            ),
+            path(
+                "wishlists/<str:key>/update/",
                 login_required(self.wishlists_update_view.as_view()),
-                name='wishlists-update'),
+                name="wishlists-update",
+            ),
             path(
-                'wishlists/<str:key>/delete/',
+                "wishlists/<str:key>/delete/",
                 login_required(self.wishlists_delete_view.as_view()),
-                name='wishlists-delete'),
+                name="wishlists-delete",
+            ),
             path(
-                'wishlists/<str:key>/lines/<int:line_pk>/delete/',
+                "wishlists/<str:key>/lines/<int:line_pk>/delete/",
                 login_required(self.wishlists_remove_product_view.as_view()),
-                name='wishlists-remove-product'),
+                name="wishlists-remove-product",
+            ),
             path(
-                'wishlists/<str:key>/products/<int:product_pk>/delete/',
+                "wishlists/<str:key>/products/<int:product_pk>/delete/",
                 login_required(self.wishlists_remove_product_view.as_view()),
-                name='wishlists-remove-product'),
+                name="wishlists-remove-product",
+            ),
             path(
-                'wishlists/<str:key>/lines/<int:line_pk>/move-to/<str:to_key>/',
+                "wishlists/<str:key>/lines/<int:line_pk>/move-to/<str:to_key>/",
                 login_required(self.wishlists_move_product_to_another_view.as_view()),
-                name='wishlists-move-product-to-another')
+                name="wishlists-move-product-to-another",
+            ),
         ]
 
         return self.post_process_urls(urls)

src/oscar/apps/customer/auth_backends.py

@@ -6,11 +6,11 @@ from oscar.core.compat import get_user_model
 
 User = get_user_model()
 
-if hasattr(User, 'REQUIRED_FIELDS'):
-    if not (User.USERNAME_FIELD == 'email' or 'email' in User.REQUIRED_FIELDS):
+if hasattr(User, "REQUIRED_FIELDS"):
+    if not (User.USERNAME_FIELD == "email" or "email" in User.REQUIRED_FIELDS):
         raise ImproperlyConfigured(
-            "EmailBackend: Your User model must have an email"
-            " field with blank=False")
+            "EmailBackend: Your User model must have an email field with blank=False"
+        )
 
 
 class EmailBackend(ModelBackend):
@@ -20,16 +20,17 @@ class EmailBackend(ModelBackend):
     For this to work, the User model must have an 'email' field
     """
 
+    # pylint: disable=keyword-arg-before-vararg
     def _authenticate(self, request, email=None, password=None, *args, **kwargs):
         if email is None:
-            if 'username' not in kwargs or kwargs['username'] is None:
+            if "username" not in kwargs or kwargs["username"] is None:
                 return None
-            clean_email = normalise_email(kwargs['username'])
+            clean_email = normalise_email(kwargs["username"])
         else:
             clean_email = normalise_email(email)
 
         # Check if we're dealing with an email address
-        if '@' not in clean_email:
+        if "@" not in clean_email:
             return None
 
         # Since Django doesn't enforce emails to be unique, we look for all
@@ -40,7 +41,10 @@ class EmailBackend(ModelBackend):
         # We make a case-insensitive match when looking for emails.
         matching_users = User.objects.filter(email__iexact=clean_email)
         authenticated_users = [
-            user for user in matching_users if (user.check_password(password) and self.user_can_authenticate(user))]
+            user
+            for user in matching_users
+            if (user.check_password(password) and self.user_can_authenticate(user))
+        ]
         if len(authenticated_users) == 1:
             # Happy path
             return authenticated_users[0]
@@ -49,8 +53,8 @@ class EmailBackend(ModelBackend):
             # the same email address AND password. We can't safely authenticate
             # either.
             raise User.MultipleObjectsReturned(
-                "There are multiple users with the given email address and "
-                "password")
+                "There are multiple users with the given email address and password"
+            )
         return None
 
     def authenticate(self, *args, **kwargs):

src/oscar/apps/customer/forms.py

@@ -19,14 +19,14 @@ from oscar.core.loading import get_class, get_model, get_profile_class
 from oscar.core.utils import datetime_combine
 from oscar.forms import widgets
 
-CustomerDispatcher = get_class('customer.utils', 'CustomerDispatcher')
-ProductAlert = get_model('customer', 'ProductAlert')
+CustomerDispatcher = get_class("customer.utils", "CustomerDispatcher")
+ProductAlert = get_model("customer", "ProductAlert")
 User = get_user_model()
 
 
 def generate_username():
     letters = string.ascii_letters
-    allowed_chars = letters + string.digits + '_'
+    allowed_chars = letters + string.digits + "_"
     uname = get_random_string(length=30, allowed_chars=allowed_chars)
     try:
         User.objects.get(username=uname)
@@ -40,7 +40,7 @@ class PasswordResetForm(auth_forms.PasswordResetForm):
     This form takes the same structure as its parent from :py:mod:`django.contrib.auth`
     """
 
-    def save(self, domain_override=None, request=None, **kwargs):
+    def save(self, *args, domain_override=None, request=None, **kwargs):
         """
         Generates a one-use only link for resetting password and sends to the
         user.
@@ -48,15 +48,15 @@ class PasswordResetForm(auth_forms.PasswordResetForm):
         site = get_current_site(request)
         if domain_override is not None:
             site.domain = site.name = domain_override
-        for user in self.get_users(self.cleaned_data['email']):
+        for user in self.get_users(self.cleaned_data["email"]):
             self.send_password_reset_email(site, user, request)
 
     def send_password_reset_email(self, site, user, request=None):
         extra_context = {
-            'user': user,
-            'site': site,
-            'reset_url': get_password_reset_url(user),
-            'request': request,
+            "user": user,
+            "site": site,
+            "reset_url": get_password_reset_url(user),
+            "request": request,
         }
         CustomerDispatcher().send_password_reset_email_for_user(user, extra_context)
 
@@ -67,16 +67,16 @@ class EmailAuthenticationForm(AuthenticationForm):
     usernames. 75 character usernames are needed to support the EmailOrUsername
     authentication backend.
     """
-    username = forms.EmailField(label=_('Email address'))
-    redirect_url = forms.CharField(
-        widget=forms.HiddenInput, required=False)
+
+    username = forms.EmailField(label=_("Email address"))
+    redirect_url = forms.CharField(widget=forms.HiddenInput, required=False)
 
     def __init__(self, host, *args, **kwargs):
         self.host = host
         super().__init__(*args, **kwargs)
 
     def clean_redirect_url(self):
-        url = self.cleaned_data['redirect_url'].strip()
+        url = self.cleaned_data["redirect_url"].strip()
         if url and url_has_allowed_host_and_scheme(url, self.host):
             return url
 
@@ -87,6 +87,7 @@ class ConfirmPasswordForm(forms.Form):
     usernames. 75 character usernames are needed to support the EmailOrUsername
     authentication backend.
     """
+
     password = forms.CharField(label=_("Password"), widget=forms.PasswordInput)
 
     def __init__(self, user, *args, **kwargs):
@@ -94,33 +95,29 @@ class ConfirmPasswordForm(forms.Form):
         self.user = user
 
     def clean_password(self):
-        password = self.cleaned_data['password']
+        password = self.cleaned_data["password"]
         if not self.user.check_password(password):
-            raise forms.ValidationError(
-                _("The entered password is not valid!"))
+            raise forms.ValidationError(_("The entered password is not valid!"))
         return password
 
 
 class EmailUserCreationForm(forms.ModelForm):
-    email = forms.EmailField(label=_('Email address'))
-    password1 = forms.CharField(
-        label=_('Password'), widget=forms.PasswordInput)
-    password2 = forms.CharField(
-        label=_('Confirm password'), widget=forms.PasswordInput)
-    redirect_url = forms.CharField(
-        widget=forms.HiddenInput, required=False)
+    email = forms.EmailField(label=_("Email address"))
+    password1 = forms.CharField(label=_("Password"), widget=forms.PasswordInput)
+    password2 = forms.CharField(label=_("Confirm password"), widget=forms.PasswordInput)
+    redirect_url = forms.CharField(widget=forms.HiddenInput, required=False)
 
     class Meta:
         model = User
-        fields = ('email',)
+        fields = ("email",)
 
-    def __init__(self, host=None, *args, **kwargs):
+    def __init__(self, *args, host=None, **kwargs):
         self.host = host
         super().__init__(*args, **kwargs)
 
     def _post_clean(self):
         super()._post_clean()
-        password = self.cleaned_data.get('password2')
+        password = self.cleaned_data.get("password2")
         # Validate after self.instance is updated with form data
         # otherwise validators can't access email
         # see django.contrib.auth.forms.UserCreationForm
@@ -128,37 +125,37 @@ class EmailUserCreationForm(forms.ModelForm):
             try:
                 validate_password(password, self.instance)
             except forms.ValidationError as error:
-                self.add_error('password2', error)
+                self.add_error("password2", error)
 
     def clean_email(self):
         """
         Checks for existing users with the supplied email address.
         """
-        email = normalise_email(self.cleaned_data['email'])
+        email = normalise_email(self.cleaned_data["email"])
         if User._default_manager.filter(email__iexact=email).exists():
             raise forms.ValidationError(
-                _("A user with that email address already exists"))
+                _("A user with that email address already exists")
+            )
         return email
 
     def clean_password2(self):
-        password1 = self.cleaned_data.get('password1', '')
-        password2 = self.cleaned_data.get('password2', '')
+        password1 = self.cleaned_data.get("password1", "")
+        password2 = self.cleaned_data.get("password2", "")
         if password1 != password2:
-            raise forms.ValidationError(
-                _("The two password fields didn't match."))
+            raise forms.ValidationError(_("The two password fields didn't match."))
         return password2
 
     def clean_redirect_url(self):
-        url = self.cleaned_data['redirect_url'].strip()
+        url = self.cleaned_data["redirect_url"].strip()
         if url and url_has_allowed_host_and_scheme(url, self.host):
             return url
         return settings.LOGIN_REDIRECT_URL
 
     def save(self, commit=True):
         user = super().save(commit=False)
-        user.set_password(self.cleaned_data['password1'])
+        user.set_password(self.cleaned_data["password1"])
 
-        if 'username' in [f.name for f in User._meta.fields]:
+        if "username" in [f.name for f in User._meta.fields]:
             user.username = generate_username()
         if commit:
             user.save()
@@ -167,17 +164,25 @@ class EmailUserCreationForm(forms.ModelForm):
 
 class OrderSearchForm(forms.Form):
     date_from = forms.DateField(
-        required=False, label=pgettext_lazy("start date", "From"),
-        widget=widgets.DatePickerInput())
+        required=False,
+        label=pgettext_lazy("start date", "From"),
+        widget=widgets.DatePickerInput(),
+    )
     date_to = forms.DateField(
-        required=False, label=pgettext_lazy("end date", "To"),
-        widget=widgets.DatePickerInput())
+        required=False,
+        label=pgettext_lazy("end date", "To"),
+        widget=widgets.DatePickerInput(),
+    )
     order_number = forms.CharField(required=False, label=_("Order number"))
 
     def clean(self):
-        if self.is_valid() and not any([self.cleaned_data['date_from'],
-                                        self.cleaned_data['date_to'],
-                                        self.cleaned_data['order_number']]):
+        if self.is_valid() and not any(
+            [
+                self.cleaned_data["date_from"],
+                self.cleaned_data["date_to"],
+                self.cleaned_data["order_number"],
+            ]
+        ):
             raise forms.ValidationError(_("At least one field is required."))
         return super().clean()
 
@@ -187,67 +192,71 @@ class OrderSearchForm(forms.Form):
         are listed.
         """
         if not self.is_bound or not self.is_valid():
-            return _('All orders')
+            return _("All orders")
         else:
-            date_from = self.cleaned_data['date_from']
-            date_to = self.cleaned_data['date_to']
-            order_number = self.cleaned_data['order_number']
+            date_from = self.cleaned_data["date_from"]
+            date_to = self.cleaned_data["date_to"]
+            order_number = self.cleaned_data["order_number"]
             return self._orders_description(date_from, date_to, order_number)
 
     def _orders_description(self, date_from, date_to, order_number):
         if date_from and date_to:
             if order_number:
-                desc = _('Orders placed between %(date_from)s and '
-                         '%(date_to)s and order number containing '
-                         '%(order_number)s')
+                desc = _(
+                    "Orders placed between %(date_from)s and "
+                    "%(date_to)s and order number containing "
+                    "%(order_number)s"
+                )
             else:
-                desc = _('Orders placed between %(date_from)s and '
-                         '%(date_to)s')
+                desc = _("Orders placed between %(date_from)s and% (date_to)s")
         elif date_from:
             if order_number:
-                desc = _('Orders placed since %(date_from)s and '
-                         'order number containing %(order_number)s')
+                desc = _(
+                    "Orders placed since %(date_from)s and "
+                    "order number containing %(order_number)s"
+                )
             else:
-                desc = _('Orders placed since %(date_from)s')
+                desc = _("Orders placed since %(date_from)s")
         elif date_to:
             if order_number:
-                desc = _('Orders placed until %(date_to)s and '
-                         'order number containing %(order_number)s')
+                desc = _(
+                    "Orders placed until %(date_to)s and "
+                    "order number containing %(order_number)s"
+                )
             else:
-                desc = _('Orders placed until %(date_to)s')
+                desc = _("Orders placed until %(date_to)s")
         elif order_number:
-            desc = _('Orders with order number containing %(order_number)s')
+            desc = _("Orders with order number containing %(order_number)s")
         else:
             return None
         params = {
-            'date_from': date_from,
-            'date_to': date_to,
-            'order_number': order_number,
+            "date_from": date_from,
+            "date_to": date_to,
+            "order_number": order_number,
         }
         return desc % params
 
     def get_filters(self):
-        date_from = self.cleaned_data['date_from']
-        date_to = self.cleaned_data['date_to']
-        order_number = self.cleaned_data['order_number']
+        date_from = self.cleaned_data["date_from"]
+        date_to = self.cleaned_data["date_to"]
+        order_number = self.cleaned_data["order_number"]
         kwargs = {}
         if date_from:
-            kwargs['date_placed__gte'] = datetime_combine(date_from, datetime.time.min)
+            kwargs["date_placed__gte"] = datetime_combine(date_from, datetime.time.min)
         if date_to:
-            kwargs['date_placed__lte'] = datetime_combine(date_to, datetime.time.max)
+            kwargs["date_placed__lte"] = datetime_combine(date_to, datetime.time.max)
         if order_number:
-            kwargs['number__contains'] = order_number
+            kwargs["number__contains"] = order_number
         return kwargs
 
 
 class UserForm(forms.ModelForm):
-
     def __init__(self, user, *args, **kwargs):
         self.user = user
-        kwargs['instance'] = user
+        kwargs["instance"] = user
         super().__init__(*args, **kwargs)
-        if 'email' in self.fields:
-            self.fields['email'].required = True
+        if "email" in self.fields:
+            self.fields["email"].required = True
 
     def clean_email(self):
         """
@@ -256,31 +265,32 @@ class UserForm(forms.ModelForm):
         uniqueness of email addresses is *not* enforced on the model
         level in ``django.contrib.auth.models.User``.
         """
-        email = normalise_email(self.cleaned_data['email'])
-        if User._default_manager.filter(
-                email__iexact=email).exclude(id=self.user.id).exists():
-            raise ValidationError(
-                _("A user with this email address already exists"))
+        email = normalise_email(self.cleaned_data["email"])
+        if (
+            User._default_manager.filter(email__iexact=email)
+            .exclude(id=self.user.id)
+            .exists()
+        ):
+            raise ValidationError(_("A user with this email address already exists"))
         # Save the email unaltered
         return email
 
     class Meta:
         model = User
-        fields = existing_user_fields(['first_name', 'last_name', 'email'])
+        fields = existing_user_fields(["first_name", "last_name", "email"])
 
 
 Profile = get_profile_class()
-if Profile:  # noqa (too complex (12))
+if Profile:
 
     class UserAndProfileForm(forms.ModelForm):
-
         def __init__(self, user, *args, **kwargs):
             try:
                 instance = Profile.objects.get(user=user)
             except Profile.DoesNotExist:
                 # User has no profile, try a blank one
                 instance = Profile(user=user)
-            kwargs['instance'] = instance
+            kwargs["instance"] = instance
 
             super().__init__(*args, **kwargs)
 
@@ -289,8 +299,8 @@ if Profile:  # noqa (too complex (12))
 
             # Get user field names (we look for core user fields first)
             core_field_names = set([f.name for f in User._meta.fields])
-            user_field_names = ['email']
-            for field_name in ('first_name', 'last_name'):
+            user_field_names = ["email"]
+            for field_name in ("first_name", "last_name"):
                 if field_name in core_field_names:
                     user_field_names.append(field_name)
             user_field_names.extend(User._meta.additional_fields)
@@ -299,12 +309,11 @@ if Profile:  # noqa (too complex (12))
             self.user_field_names = user_field_names
 
             # Add additional user form fields
-            additional_fields = forms.fields_for_model(
-                User, fields=user_field_names)
+            additional_fields = forms.fields_for_model(User, fields=user_field_names)
             self.fields.update(additional_fields)
 
             # Ensure email is required and initialised correctly
-            self.fields['email'].required = True
+            self.fields["email"].required = True
 
             # Set initial values
             for field_name in user_field_names:
@@ -316,16 +325,19 @@ if Profile:  # noqa (too complex (12))
 
         class Meta:
             model = Profile
-            exclude = ('user',)
+            # pylint: disable=modelform-uses-exclude
+            exclude = ("user",)
 
         def clean_email(self):
-            email = normalise_email(self.cleaned_data['email'])
+            email = normalise_email(self.cleaned_data["email"])
 
             users_with_email = User._default_manager.filter(
-                email__iexact=email).exclude(id=self.instance.user.id)
+                email__iexact=email
+            ).exclude(id=self.instance.user.id)
             if users_with_email.exists():
                 raise ValidationError(
-                    _("A user with this email address already exists"))
+                    _("A user with this email address already exists")
+                )
             return email
 
         def save(self, *args, **kwargs):
@@ -344,10 +356,11 @@ else:
 
 
 class ProductAlertForm(forms.ModelForm):
-    email = forms.EmailField(required=True, label=_('Send notification to'),
-                             widget=forms.TextInput(attrs={
-                                 'placeholder': _('Enter your email')
-                             }))
+    email = forms.EmailField(
+        required=True,
+        label=_("Send notification to"),
+        widget=forms.TextInput(attrs={"placeholder": _("Enter your email")}),
+    )
 
     def __init__(self, user, product, *args, **kwargs):
         self.user = user
@@ -356,8 +369,8 @@ class ProductAlertForm(forms.ModelForm):
 
         # Only show email field to unauthenticated users
         if user and user.is_authenticated:
-            self.fields['email'].widget = forms.HiddenInput()
-            self.fields['email'].required = False
+            self.fields["email"].widget = forms.HiddenInput()
+            self.fields["email"].required = False
 
     def save(self, commit=True):
         alert = super().save(commit=False)
@@ -370,39 +383,48 @@ class ProductAlertForm(forms.ModelForm):
 
     def clean(self):
         cleaned_data = self.cleaned_data
-        email = cleaned_data.get('email')
+        email = cleaned_data.get("email")
         if email:
             try:
                 ProductAlert.objects.get(
-                    product=self.product, email__iexact=email,
-                    status=ProductAlert.ACTIVE)
+                    product=self.product,
+                    email__iexact=email,
+                    status=ProductAlert.ACTIVE,
+                )
             except ProductAlert.DoesNotExist:
                 pass
             else:
-                raise forms.ValidationError(_(
-                    "There is already an active stock alert for %s") % email)
+                raise forms.ValidationError(
+                    _("There is already an active stock alert for %s") % email
+                )
 
             # Check that the email address hasn't got other unconfirmed alerts.
             # If they do then we don't want to spam them with more until they
             # have confirmed or cancelled the existing alert.
-            if ProductAlert.objects.filter(email__iexact=email,
-                                           status=ProductAlert.UNCONFIRMED).count():
-                raise forms.ValidationError(_(
-                    "%s has been sent a confirmation email for another product "
-                    "alert on this site. Please confirm or cancel that request "
-                    "before signing up for more alerts.") % email)
+            if ProductAlert.objects.filter(
+                email__iexact=email, status=ProductAlert.UNCONFIRMED
+            ).count():
+                raise forms.ValidationError(
+                    _(
+                        "%s has been sent a confirmation email for another product "
+                        "alert on this site. Please confirm or cancel that request "
+                        "before signing up for more alerts."
+                    )
+                    % email
+                )
         elif self.user.is_authenticated:
             try:
-                ProductAlert.objects.get(product=self.product,
-                                         user=self.user,
-                                         status=ProductAlert.ACTIVE)
+                ProductAlert.objects.get(
+                    product=self.product, user=self.user, status=ProductAlert.ACTIVE
+                )
             except ProductAlert.DoesNotExist:
                 pass
             else:
-                raise forms.ValidationError(_(
-                    "You already have an active alert for this product"))
+                raise forms.ValidationError(
+                    _("You already have an active alert for this product")
+                )
         return cleaned_data
 
     class Meta:
         model = ProductAlert
-        fields = ['email']
+        fields = ["email"]

src/oscar/apps/customer/history.py

@@ -4,15 +4,15 @@ from django.conf import settings
 
 from oscar.core.loading import get_model
 
-Product = get_model('catalogue', 'Product')
+Product = get_model("catalogue", "Product")
 
 
 class CustomerHistoryManager:
     cookie_name = settings.OSCAR_RECENTLY_VIEWED_COOKIE_NAME
     cookie_kwargs = {
-        'max_age': settings.OSCAR_RECENTLY_VIEWED_COOKIE_LIFETIME,
-        'secure': settings.OSCAR_RECENTLY_VIEWED_COOKIE_SECURE,
-        'httponly': True,
+        "max_age": settings.OSCAR_RECENTLY_VIEWED_COOKIE_LIFETIME,
+        "secure": settings.OSCAR_RECENTLY_VIEWED_COOKIE_SECURE,
+        "httponly": True,
     }
     max_products = settings.OSCAR_RECENTLY_VIEWED_PRODUCTS
 
@@ -26,7 +26,9 @@ class CustomerHistoryManager:
         # Reordering as the ID order gets messed up in the query
         product_dict = Product.objects.browsable().in_bulk(ids)
         ids.reverse()
-        return [product_dict[product_id] for product_id in ids if product_id in product_dict]
+        return [
+            product_dict[product_id] for product_id in ids if product_id in product_dict
+        ]
 
     @classmethod
     def extract(cls, request, response=None):
@@ -56,7 +58,7 @@ class CustomerHistoryManager:
             ids.remove(new_id)
         ids.append(new_id)
         if len(ids) > cls.max_products:
-            ids = ids[len(ids) - cls.max_products:]
+            ids = ids[len(ids) - cls.max_products :]
         return ids
 
     @classmethod
@@ -68,6 +70,5 @@ class CustomerHistoryManager:
         ids = cls.extract(request, response)
         updated_ids = cls.add(ids, product.id)
         response.set_cookie(
-            cls.cookie_name,
-            json.dumps(updated_ids),
-            **cls.cookie_kwargs)
+            cls.cookie_name, json.dumps(updated_ids), **cls.cookie_kwargs
+        )

src/oscar/apps/customer/mixins.py

@@ -9,10 +9,10 @@ from oscar.core.compat import get_user_model
 from oscar.core.loading import get_class, get_model
 
 User = get_user_model()
-CommunicationEventType = get_model('communication', 'CommunicationEventType')
-CustomerDispatcher = get_class('customer.utils', 'CustomerDispatcher')
+CommunicationEventType = get_model("communication", "CommunicationEventType")
+CustomerDispatcher = get_class("customer.utils", "CustomerDispatcher")
 
-logger = logging.getLogger('oscar.customer')
+logger = logging.getLogger("oscar.customer")
 
 
 class PageTitleMixin(object):
@@ -22,6 +22,7 @@ class PageTitleMixin(object):
 
     Dynamic page titles are possible by overriding get_page_title.
     """
+
     page_title = None
     active_tab = None
 
@@ -31,13 +32,12 @@ class PageTitleMixin(object):
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
-        ctx.setdefault('page_title', self.get_page_title())
-        ctx.setdefault('active_tab', self.active_tab)
+        ctx.setdefault("page_title", self.get_page_title())
+        ctx.setdefault("active_tab", self.active_tab)
         return ctx
 
 
 class RegisterUserMixin(object):
-
     def register_user(self, form):
         """
         Create a user instance and send a new registration email (if configured
@@ -47,17 +47,16 @@ class RegisterUserMixin(object):
 
         # Raise signal robustly (we don't want exceptions to crash the request
         # handling).
-        user_registered.send_robust(
-            sender=self, request=self.request, user=user)
+        user_registered.send_robust(sender=self, request=self.request, user=user)
 
-        if getattr(settings, 'OSCAR_SEND_REGISTRATION_EMAIL', True):
+        if getattr(settings, "OSCAR_SEND_REGISTRATION_EMAIL", True):
             self.send_registration_email(user)
 
         # We have to authenticate before login
         try:
             user = authenticate(
-                username=user.email,
-                password=form.cleaned_data['password1'])
+                username=user.email, password=form.cleaned_data["password1"]
+            )
         except User.MultipleObjectsReturned:
             # Handle race condition where the registration request is made
             # multiple times in quick succession.  This leads to both requests
@@ -65,8 +64,9 @@ class RegisterUserMixin(object):
             # hasn't committed when the second one runs the check).  We retain
             # the first one and deactivate the dupes.
             logger.warning(
-                'Multiple users with identical email address and password'
-                'were found. Marking all but one as not active.')
+                "Multiple users with identical email address and password"
+                "were found. Marking all but one as not active."
+            )
             # As this section explicitly deals with the form being submitted
             # twice, this is about the only place in Oscar where we don't
             # ignore capitalisation when looking up an email address.
@@ -82,5 +82,5 @@ class RegisterUserMixin(object):
         return user
 
     def send_registration_email(self, user):
-        extra_context = {'user': user, 'request': self.request}
+        extra_context = {"user": user, "request": self.request}
         CustomerDispatcher().send_registration_email_for_user(user, extra_context)

src/oscar/apps/customer/models.py

@@ -4,8 +4,9 @@ from oscar.core.loading import is_model_registered
 __all__ = []
 
 
-if not is_model_registered('customer', 'ProductAlert'):
+if not is_model_registered("customer", "ProductAlert"):
+
     class ProductAlert(abstract_models.AbstractProductAlert):
         pass
 
-    __all__.append('ProductAlert')
+    __all__.append("ProductAlert")

src/oscar/apps/customer/receivers.py

@@ -3,9 +3,10 @@ from django.dispatch import receiver
 from oscar.apps.catalogue.signals import product_viewed
 from oscar.core.loading import get_class
 
-CustomerHistoryManager = get_class('customer.history', 'CustomerHistoryManager')
+CustomerHistoryManager = get_class("customer.history", "CustomerHistoryManager")
 
 
+# pylint: disable=unused-argument
 @receiver(product_viewed)
 def receive_product_view(sender, product, user, request, response, **kwargs):
     """

src/oscar/apps/customer/utils.py

@@ -5,8 +5,8 @@ from django.utils.http import urlsafe_base64_encode
 
 from oscar.core.loading import get_class
 
-Dispatcher = get_class('communication.utils', 'Dispatcher')
-Selector = get_class('partner.strategy', 'Selector')
+Dispatcher = get_class("communication.utils", "Dispatcher")
+Selector = get_class("partner.strategy", "Selector")
 
 
 class CustomerDispatcher:
@@ -15,29 +15,36 @@ class CustomerDispatcher:
     """
 
     # Event codes
-    REGISTRATION_EVENT_CODE = 'REGISTRATION'
-    PASSWORD_RESET_EVENT_CODE = 'PASSWORD_RESET'
-    PASSWORD_CHANGED_EVENT_CODE = 'PASSWORD_CHANGED'
-    EMAIL_CHANGED_EVENT_CODE = 'EMAIL_CHANGED'
+    REGISTRATION_EVENT_CODE = "REGISTRATION"
+    PASSWORD_RESET_EVENT_CODE = "PASSWORD_RESET"
+    PASSWORD_CHANGED_EVENT_CODE = "PASSWORD_CHANGED"
+    EMAIL_CHANGED_EVENT_CODE = "EMAIL_CHANGED"
 
     def __init__(self, logger=None, mail_connection=None):
         self.dispatcher = Dispatcher(logger=logger, mail_connection=mail_connection)
 
     def send_registration_email_for_user(self, user, extra_context):
-        messages = self.dispatcher.get_messages(self.REGISTRATION_EVENT_CODE, extra_context)
+        messages = self.dispatcher.get_messages(
+            self.REGISTRATION_EVENT_CODE, extra_context
+        )
         self.dispatcher.dispatch_user_messages(user, messages)
 
     def send_password_reset_email_for_user(self, user, extra_context):
-        messages = self.dispatcher.get_messages(self.PASSWORD_RESET_EVENT_CODE, extra_context)
+        messages = self.dispatcher.get_messages(
+            self.PASSWORD_RESET_EVENT_CODE, extra_context
+        )
         self.dispatcher.dispatch_user_messages(user, messages)
 
     def send_password_changed_email_for_user(self, user, extra_context):
-        messages = self.dispatcher.get_messages(self.PASSWORD_CHANGED_EVENT_CODE, extra_context)
+        messages = self.dispatcher.get_messages(
+            self.PASSWORD_CHANGED_EVENT_CODE, extra_context
+        )
         self.dispatcher.dispatch_user_messages(user, messages)
 
     def send_email_changed_email_for_user(self, user, extra_context):
         messages = self.dispatcher.get_messages(
-            self.EMAIL_CHANGED_EVENT_CODE, extra_context)
+            self.EMAIL_CHANGED_EVENT_CODE, extra_context
+        )
         self.dispatcher.dispatch_user_messages(user, messages)
 
 
@@ -46,10 +53,10 @@ def get_password_reset_url(user, token_generator=default_token_generator):
     Generate a password-reset URL for a given user
     """
     kwargs = {
-        'token': token_generator.make_token(user),
-        'uidb64': urlsafe_base64_encode(force_bytes(user.id)),
+        "token": token_generator.make_token(user),
+        "uidb64": urlsafe_base64_encode(force_bytes(user.id)),
     }
-    return reverse('password-reset-confirm', kwargs=kwargs)
+    return reverse("password-reset-confirm", kwargs=kwargs)
 
 
 def normalise_email(email):
@@ -59,7 +66,7 @@ def normalise_email(email):
     handling.
     """
     clean_email = email.strip()
-    if '@' in clean_email:
-        local, host = clean_email.rsplit('@', 1)
-        return local + '@' + host.lower()
+    if "@" in clean_email:
+        local, host = clean_email.rsplit("@", 1)
+        return local + "@" + host.lower()
     return clean_email

src/oscar/apps/customer/views.py

@@ -1,3 +1,4 @@
+# pylint: disable=attribute-defined-outside-init
 from django import http
 from django.conf import settings
 from django.contrib import messages
@@ -13,25 +14,27 @@ from django.views import generic
 
 from oscar.apps.customer.utils import get_password_reset_url
 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.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(
-    'customer.mixins', ['PageTitleMixin', 'RegisterUserMixin'])
-CustomerDispatcher = get_class('customer.utils', 'CustomerDispatcher')
+    "customer.mixins", ["PageTitleMixin", "RegisterUserMixin"]
+)
+CustomerDispatcher = get_class("customer.utils", "CustomerDispatcher")
 EmailAuthenticationForm, EmailUserCreationForm, OrderSearchForm = get_classes(
-    'customer.forms', ['EmailAuthenticationForm', 'EmailUserCreationForm',
-                       'OrderSearchForm'])
+    "customer.forms",
+    ["EmailAuthenticationForm", "EmailUserCreationForm", "OrderSearchForm"],
+)
 ProfileForm, ConfirmPasswordForm = get_classes(
-    'customer.forms', ['ProfileForm', 'ConfirmPasswordForm'])
-UserAddressForm = get_class('address.forms', 'UserAddressForm')
-Order = get_model('order', 'Order')
-UserAddress = get_model('address', 'UserAddress')
-Email = get_model('communication', 'Email')
+    "customer.forms", ["ProfileForm", "ConfirmPasswordForm"]
+)
+UserAddressForm = get_class("address.forms", "UserAddressForm")
+Order = get_model("order", "Order")
+UserAddress = get_model("address", "UserAddress")
+Email = get_model("communication", "Email")
 
 User = get_user_model()
 
@@ -52,42 +55,41 @@ class AccountSummaryView(generic.RedirectView):
     such like. The presence of this view allows just that, without
     having to change a lot of templates.
     """
+
     pattern_name = settings.OSCAR_ACCOUNTS_REDIRECT_URL
     permanent = False
 
 
 class AccountRegistrationView(RegisterUserMixin, generic.FormView):
     form_class = EmailUserCreationForm
-    template_name = 'oscar/customer/registration.html'
-    redirect_field_name = 'next'
+    template_name = "oscar/customer/registration.html"
+    redirect_field_name = "next"
 
     def get(self, request, *args, **kwargs):
         if request.user.is_authenticated:
             return redirect(settings.LOGIN_REDIRECT_URL)
-        return super().get(
-            request, *args, **kwargs)
+        return super().get(request, *args, **kwargs)
 
     def get_logged_in_redirect(self):
-        return reverse('customer:summary')
+        return reverse("customer:summary")
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['initial'] = {
-            'email': self.request.GET.get('email', ''),
-            'redirect_url': self.request.GET.get(self.redirect_field_name, '')
+        kwargs["initial"] = {
+            "email": self.request.GET.get("email", ""),
+            "redirect_url": self.request.GET.get(self.redirect_field_name, ""),
         }
-        kwargs['host'] = self.request.get_host()
+        kwargs["host"] = self.request.get_host()
         return kwargs
 
     def get_context_data(self, *args, **kwargs):
-        ctx = super().get_context_data(
-            *args, **kwargs)
-        ctx['cancel_url'] = safe_referrer(self.request, '')
+        ctx = super().get_context_data(*args, **kwargs)
+        ctx["cancel_url"] = safe_referrer(self.request, "")
         return ctx
 
     def form_valid(self, form):
         self.register_user(form)
-        return redirect(form.cleaned_data['redirect_url'])
+        return redirect(form.cleaned_data["redirect_url"])
 
 
 class AccountAuthView(RegisterUserMixin, generic.TemplateView):
@@ -95,53 +97,54 @@ class AccountAuthView(RegisterUserMixin, generic.TemplateView):
     This is actually a slightly odd double form view that allows a customer to
     either login or register.
     """
-    template_name = 'oscar/customer/login_registration.html'
-    login_prefix, registration_prefix = 'login', 'registration'
+
+    template_name = "oscar/customer/login_registration.html"
+    login_prefix, registration_prefix = "login", "registration"
     login_form_class = EmailAuthenticationForm
     registration_form_class = EmailUserCreationForm
-    redirect_field_name = 'next'
+    redirect_field_name = "next"
 
     def get(self, request, *args, **kwargs):
         if request.user.is_authenticated:
             return redirect(settings.LOGIN_REDIRECT_URL)
-        return super().get(
-            request, *args, **kwargs)
+        return super().get(request, *args, **kwargs)
 
     def get_context_data(self, *args, **kwargs):
         ctx = super().get_context_data(*args, **kwargs)
-        if 'login_form' not in kwargs:
-            ctx['login_form'] = self.get_login_form()
-        if 'registration_form' not in kwargs:
-            ctx['registration_form'] = self.get_registration_form()
+        if "login_form" not in kwargs:
+            ctx["login_form"] = self.get_login_form()
+        if "registration_form" not in kwargs:
+            ctx["registration_form"] = self.get_registration_form()
         return ctx
 
     def post(self, request, *args, **kwargs):
         # Use the name of the submit button to determine which form to validate
-        if 'login_submit' in request.POST:
+        if "login_submit" in request.POST:
             return self.validate_login_form()
-        elif 'registration_submit' in request.POST:
+        elif "registration_submit" in request.POST:
             return self.validate_registration_form()
         return http.HttpResponseBadRequest()
 
     # LOGIN
 
     def get_login_form(self, bind_data=False):
-        return self.login_form_class(
-            **self.get_login_form_kwargs(bind_data))
+        return self.login_form_class(**self.get_login_form_kwargs(bind_data))
 
     def get_login_form_kwargs(self, bind_data=False):
         kwargs = {}
-        kwargs['request'] = self.request
-        kwargs['host'] = self.request.get_host()
-        kwargs['prefix'] = self.login_prefix
-        kwargs['initial'] = {
-            'redirect_url': self.request.GET.get(self.redirect_field_name, ''),
+        kwargs["request"] = self.request
+        kwargs["host"] = self.request.get_host()
+        kwargs["prefix"] = self.login_prefix
+        kwargs["initial"] = {
+            "redirect_url": self.request.GET.get(self.redirect_field_name, ""),
         }
-        if bind_data and self.request.method in ('POST', 'PUT'):
-            kwargs.update({
-                'data': self.request.POST,
-                'files': self.request.FILES,
-            })
+        if bind_data and self.request.method in ("POST", "PUT"):
+            kwargs.update(
+                {
+                    "data": self.request.POST,
+                    "files": self.request.FILES,
+                }
+            )
         return kwargs
 
     def validate_login_form(self):
@@ -158,8 +161,11 @@ class AccountAuthView(RegisterUserMixin, generic.TemplateView):
             # request handling). We use a custom signal as we want to track the
             # session key before calling login (which cycles the session ID).
             signals.user_logged_in.send_robust(
-                sender=self, request=self.request, user=user,
-                old_session_key=old_session_key)
+                sender=self,
+                request=self.request,
+                user=user,
+                old_session_key=old_session_key,
+            )
 
             msg = self.get_login_success_message(form)
             if msg:
@@ -170,18 +176,19 @@ class AccountAuthView(RegisterUserMixin, generic.TemplateView):
         ctx = self.get_context_data(login_form=form)
         return self.render_to_response(ctx)
 
+    # pylint: disable=unused-argument
     def get_login_success_message(self, form):
         return _("Welcome back")
 
     def get_login_success_url(self, form):
-        redirect_url = form.cleaned_data['redirect_url']
+        redirect_url = form.cleaned_data["redirect_url"]
         if redirect_url:
             return redirect_url
 
         # Redirect staff members to dashboard as that's the most likely place
         # they'll want to visit if they're logging in.
         if self.request.user.is_staff:
-            return reverse('dashboard:index')
+            return reverse("dashboard:index")
 
         return settings.LOGIN_REDIRECT_URL
 
@@ -189,20 +196,23 @@ class AccountAuthView(RegisterUserMixin, generic.TemplateView):
 
     def get_registration_form(self, bind_data=False):
         return self.registration_form_class(
-            **self.get_registration_form_kwargs(bind_data))
+            **self.get_registration_form_kwargs(bind_data)
+        )
 
     def get_registration_form_kwargs(self, bind_data=False):
         kwargs = {}
-        kwargs['host'] = self.request.get_host()
-        kwargs['prefix'] = self.registration_prefix
-        kwargs['initial'] = {
-            'redirect_url': self.request.GET.get(self.redirect_field_name, ''),
+        kwargs["host"] = self.request.get_host()
+        kwargs["prefix"] = self.registration_prefix
+        kwargs["initial"] = {
+            "redirect_url": self.request.GET.get(self.redirect_field_name, ""),
         }
-        if bind_data and self.request.method in ('POST', 'PUT'):
-            kwargs.update({
-                'data': self.request.POST,
-                'files': self.request.FILES,
-            })
+        if bind_data and self.request.method in ("POST", "PUT"):
+            kwargs.update(
+                {
+                    "data": self.request.POST,
+                    "files": self.request.FILES,
+                }
+            )
         return kwargs
 
     def validate_registration_form(self):
@@ -218,11 +228,12 @@ class AccountAuthView(RegisterUserMixin, generic.TemplateView):
         ctx = self.get_context_data(registration_form=form)
         return self.render_to_response(ctx)
 
+    # pylint: disable=unused-argument
     def get_registration_success_message(self, form):
         return _("Thanks for registering!")
 
     def get_registration_success_url(self, form):
-        redirect_url = form.cleaned_data['redirect_url']
+        redirect_url = form.cleaned_data["redirect_url"]
         if redirect_url:
             return redirect_url
 
@@ -249,13 +260,13 @@ class LogoutView(generic.RedirectView):
 
 
 class ProfileView(PageTitleMixin, generic.TemplateView):
-    template_name = 'oscar/customer/profile/profile.html'
-    page_title = _('Profile')
-    active_tab = 'profile'
+    template_name = "oscar/customer/profile/profile.html"
+    page_title = _("Profile")
+    active_tab = "profile"
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
-        ctx['profile_fields'] = self.get_profile_fields(self.request.user)
+        ctx["profile_fields"] = self.get_profile_fields(self.request.user)
         return ctx
 
     def get_profile_fields(self, user):
@@ -263,8 +274,7 @@ class ProfileView(PageTitleMixin, generic.TemplateView):
 
         # Check for custom user model
         for field_name in User._meta.additional_fields:
-            field_data.append(
-                self.get_model_field_data(user, field_name))
+            field_data.append(self.get_model_field_data(user, field_name))
 
         # Check for profile class
         profile_class = get_profile_class()
@@ -276,10 +286,9 @@ class ProfileView(PageTitleMixin, generic.TemplateView):
 
             field_names = [f.name for f in profile._meta.local_fields]
             for field_name in field_names:
-                if field_name in ('user', 'id'):
+                if field_name in ("user", "id"):
                     continue
-                field_data.append(
-                    self.get_model_field_data(profile, field_name))
+                field_data.append(self.get_model_field_data(profile, field_name))
 
         return field_data
 
@@ -289,25 +298,25 @@ class ProfileView(PageTitleMixin, generic.TemplateView):
         """
         field = model_class._meta.get_field(field_name)
         if field.choices:
-            value = getattr(model_class, 'get_%s_display' % field_name)()
+            value = getattr(model_class, "get_%s_display" % field_name)()
         else:
             value = getattr(model_class, field_name)
         return {
-            'name': getattr(field, 'verbose_name'),
-            'value': value,
+            "name": getattr(field, "verbose_name"),
+            "value": value,
         }
 
 
 class ProfileUpdateView(PageTitleMixin, generic.FormView):
     form_class = ProfileForm
-    template_name = 'oscar/customer/profile/profile_form.html'
-    page_title = _('Edit Profile')
-    active_tab = 'profile'
-    success_url = reverse_lazy('customer:profile-view')
+    template_name = "oscar/customer/profile/profile_form.html"
+    page_title = _("Edit Profile")
+    active_tab = "profile"
+    success_url = reverse_lazy("customer:profile-view")
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['user'] = self.request.user
+        kwargs["user"] = self.request.user
         return kwargs
 
     def form_valid(self, form):
@@ -324,7 +333,7 @@ class ProfileUpdateView(PageTitleMixin, generic.FormView):
         # cleaned data because the object created by form.save() can
         # either be a user or profile instance depending whether a profile
         # class has been specified by the AUTH_PROFILE_MODULE setting.
-        new_email = form.cleaned_data.get('email')
+        new_email = form.cleaned_data.get("email")
         if new_email and old_user and new_email != old_user.email:
             # Email address has changed - send a confirmation email to the old
             # address including a password reset link in case this is a
@@ -337,44 +346,45 @@ class ProfileUpdateView(PageTitleMixin, generic.FormView):
     def send_email_changed_email(self, old_user, new_email):
         user = self.request.user
         extra_context = {
-            'user': user,
-            'reset_url': get_password_reset_url(old_user),
-            'new_email': new_email,
-            'request': self.request,
+            "user": user,
+            "reset_url": get_password_reset_url(old_user),
+            "new_email": new_email,
+            "request": self.request,
         }
         CustomerDispatcher().send_email_changed_email_for_user(old_user, extra_context)
 
 
 class ProfileDeleteView(PageTitleMixin, generic.FormView):
     form_class = ConfirmPasswordForm
-    template_name = 'oscar/customer/profile/profile_delete.html'
-    page_title = _('Delete profile')
-    active_tab = 'profile'
+    template_name = "oscar/customer/profile/profile_delete.html"
+    page_title = _("Delete profile")
+    active_tab = "profile"
     success_url = settings.OSCAR_HOMEPAGE
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['user'] = self.request.user
+        kwargs["user"] = self.request.user
         return kwargs
 
     def form_valid(self, form):
         self.request.user.delete()
         messages.success(
             self.request,
-            _("Your profile has now been deleted. Thanks for using the site."))
+            _("Your profile has now been deleted. Thanks for using the site."),
+        )
         return redirect(self.get_success_url())
 
 
 class ChangePasswordView(PageTitleMixin, generic.FormView):
     form_class = PasswordChangeForm
-    template_name = 'oscar/customer/profile/change_password_form.html'
-    page_title = _('Change Password')
-    active_tab = 'profile'
-    success_url = reverse_lazy('customer:profile-view')
+    template_name = "oscar/customer/profile/change_password_form.html"
+    page_title = _("Change Password")
+    active_tab = "profile"
+    success_url = reverse_lazy("customer:profile-view")
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['user'] = self.request.user
+        kwargs["user"] = self.request.user
         return kwargs
 
     def form_valid(self, form):
@@ -389,9 +399,9 @@ class ChangePasswordView(PageTitleMixin, generic.FormView):
     def send_password_changed_email(self):
         user = self.request.user
         extra_context = {
-            'user': user,
-            'reset_url': get_password_reset_url(self.request.user),
-            'request': self.request,
+            "user": user,
+            "reset_url": get_password_reset_url(self.request.user),
+            "request": self.request,
         }
         CustomerDispatcher().send_password_changed_email_for_user(user, extra_context)
 
@@ -400,54 +410,59 @@ class ChangePasswordView(PageTitleMixin, generic.FormView):
 # Email history
 # =============
 
+
 class EmailHistoryView(PageTitleMixin, generic.ListView):
     context_object_name = "emails"
-    template_name = 'oscar/communication/email/email_list.html'
+    template_name = "oscar/communication/email/email_list.html"
     paginate_by = settings.OSCAR_EMAILS_PER_PAGE
-    page_title = _('Email History')
-    active_tab = 'emails'
+    page_title = _("Email History")
+    active_tab = "emails"
 
     def get_queryset(self):
         """
         Return Queryset of :py:class:`Email <oscar.apps.customer.abstract_models.AbstractEmail>`
         instances, that has been sent to the currently authenticated user.
-        """  # noqa
+        """
         return Email._default_manager.filter(user=self.request.user)
 
 
 class EmailDetailView(PageTitleMixin, generic.DetailView):
     """Customer email"""
+
     template_name = "oscar/communication/email/email_detail.html"
-    context_object_name = 'email'
-    active_tab = 'emails'
+    context_object_name = "email"
+    active_tab = "emails"
 
     def get_object(self, queryset=None):
-        return get_object_or_404(Email, user=self.request.user,
-                                 id=self.kwargs['email_id'])
+        return get_object_or_404(
+            Email, user=self.request.user, id=self.kwargs["email_id"]
+        )
 
     def get_page_title(self):
         """Append email subject to page title"""
-        return '%s: %s' % (_('Email'), self.object.subject)
+        return "%s: %s" % (_("Email"), self.object.subject)
 
 
 # =============
 # Order history
 # =============
 
+
 class OrderHistoryView(PageTitleMixin, generic.ListView):
     """
     Customer order history
     """
+
     context_object_name = "orders"
-    template_name = 'oscar/customer/order/order_list.html'
+    template_name = "oscar/customer/order/order_list.html"
     paginate_by = settings.OSCAR_ORDERS_PER_PAGE
     model = Order
     form_class = OrderSearchForm
-    page_title = _('Order History')
-    active_tab = 'orders'
+    page_title = _("Order History")
+    active_tab = "orders"
 
     def get(self, request, *args, **kwargs):
-        if 'date_from' in request.GET:
+        if "date_from" in request.GET:
             self.form = self.form_class(self.request.GET)
             if not self.form.is_valid():
                 self.object_list = self.get_queryset()
@@ -457,16 +472,15 @@ class OrderHistoryView(PageTitleMixin, generic.ListView):
 
             # If the user has just entered an order number, try and look it up
             # and redirect immediately to the order detail page.
-            if data['order_number'] and not (data['date_to']
-                                             or data['date_from']):
+            if data["order_number"] and not (data["date_to"] or data["date_from"]):
                 try:
                     order = Order.objects.get(
-                        number=data['order_number'], user=self.request.user)
+                        number=data["order_number"], user=self.request.user
+                    )
                 except Order.DoesNotExist:
                     pass
                 else:
-                    return redirect(
-                        'customer:order', order_number=order.number)
+                    return redirect("customer:order", order_number=order.number)
         else:
             self.form = self.form_class()
         return super().get(request, *args, **kwargs)
@@ -475,7 +489,7 @@ class OrderHistoryView(PageTitleMixin, generic.ListView):
         """
         Return Queryset of :py:class:`Order <oscar.apps.order.abstract_models.AbstractOrder>`
         instances for the currently authenticated user.
-        """  # noqa
+        """
         qs = self.model._default_manager.filter(user=self.request.user)
         if self.form.is_bound and self.form.is_valid():
             qs = qs.filter(**self.form.get_filters())
@@ -483,13 +497,13 @@ class OrderHistoryView(PageTitleMixin, generic.ListView):
 
     def get_context_data(self, *args, **kwargs):
         ctx = super().get_context_data(*args, **kwargs)
-        ctx['form'] = self.form
+        ctx["form"] = self.form
         return ctx
 
 
 class OrderDetailView(PageTitleMixin, PostActionMixin, generic.DetailView):
     model = Order
-    active_tab = 'orders'
+    active_tab = "orders"
 
     def get_template_names(self):
         return ["oscar/customer/order/order_detail.html"]
@@ -498,13 +512,14 @@ class OrderDetailView(PageTitleMixin, PostActionMixin, generic.DetailView):
         """
         Order number as page title
         """
-        return '%s #%s' % (_('Order'), self.object.number)
+        return "%s #%s" % (_("Order"), self.object.number)
 
     def get_object(self, queryset=None):
-        return get_object_or_404(self.model, user=self.request.user,
-                                 number=self.kwargs['order_number'])
+        return get_object_or_404(
+            self.model, user=self.request.user, number=self.kwargs["order_number"]
+        )
 
-    def do_reorder(self, order):  # noqa (too complex (10))
+    def do_reorder(self, order):
         """
         'Re-order' a previous order.
 
@@ -517,7 +532,8 @@ class OrderDetailView(PageTitleMixin, PostActionMixin, generic.DetailView):
         warnings = []
         for line in order.lines.all():
             is_available, reason = line.is_available_to_reorder(
-                basket, self.request.strategy)
+                basket, self.request.strategy
+            )
             if is_available:
                 lines_to_add.append(line)
             else:
@@ -526,11 +542,10 @@ class OrderDetailView(PageTitleMixin, PostActionMixin, generic.DetailView):
         # Check whether the number of items in the basket won't exceed the
         # maximum.
         total_quantity = sum([line.quantity for line in lines_to_add])
-        is_quantity_allowed, reason = basket.is_quantity_allowed(
-            total_quantity)
+        is_quantity_allowed, reason = basket.is_quantity_allowed(total_quantity)
         if not is_quantity_allowed:
             messages.warning(self.request, reason)
-            self.response = redirect('customer:order-list')
+            self.response = redirect("customer:order-list")
             return
 
         # Add any warnings
@@ -541,40 +556,49 @@ class OrderDetailView(PageTitleMixin, PostActionMixin, generic.DetailView):
             options = []
             for attribute in line.attributes.all():
                 if attribute.option:
-                    options.append({
-                        'option': attribute.option,
-                        'value': attribute.value})
+                    options.append(
+                        {"option": attribute.option, "value": attribute.value}
+                    )
             basket.add_product(line.product, line.quantity, options)
 
         if len(lines_to_add) > 0:
-            self.response = redirect('basket:summary')
+            self.response = redirect("basket:summary")
             messages.info(
                 self.request,
-                _("All available lines from order %(number)s "
-                  "have been added to your basket") % {'number': order.number})
+                _(
+                    "All available lines from order %(number)s "
+                    "have been added to your basket"
+                )
+                % {"number": order.number},
+            )
         else:
-            self.response = redirect('customer:order-list')
+            self.response = redirect("customer:order-list")
             messages.warning(
                 self.request,
-                _("It is not possible to re-order order %(number)s "
-                  "as none of its lines are available to purchase") %
-                {'number': order.number})
+                _(
+                    "It is not possible to re-order order %(number)s "
+                    "as none of its lines are available to purchase"
+                )
+                % {"number": order.number},
+            )
 
 
 class OrderLineView(PostActionMixin, generic.DetailView):
     """Customer order line"""
 
     def get_object(self, queryset=None):
-        order = get_object_or_404(Order, user=self.request.user,
-                                  number=self.kwargs['order_number'])
-        return order.lines.get(id=self.kwargs['line_id'])
+        order = get_object_or_404(
+            Order, user=self.request.user, number=self.kwargs["order_number"]
+        )
+        return order.lines.get(id=self.kwargs["line_id"])
 
     def do_reorder(self, line):
-        self.response = redirect('customer:order', self.kwargs['order_number'])
+        self.response = redirect("customer:order", self.kwargs["order_number"])
         basket = self.request.basket
 
         line_available_to_reorder, reason = line.is_available_to_reorder(
-            basket, self.request.strategy)
+            basket, self.request.strategy
+        )
 
         if not line_available_to_reorder:
             messages.warning(self.request, reason)
@@ -582,20 +606,19 @@ class OrderLineView(PostActionMixin, generic.DetailView):
 
         # We need to pass response to the get_or_create... method
         # as a new basket might need to be created
-        self.response = redirect('basket:summary')
+        self.response = redirect("basket:summary")
 
         # Convert line attributes into basket options
         options = []
         for attribute in line.attributes.all():
             if attribute.option:
-                options.append({'option': attribute.option,
-                                'value': attribute.value})
+                options.append({"option": attribute.option, "value": attribute.value})
         basket.add_product(line.product, line.quantity, options)
 
         if line.quantity > 1:
-            msg = _("%(qty)d copies of '%(product)s' have been added to your"
-                    " basket") % {
-                'qty': line.quantity, 'product': line.product}
+            msg = _(
+                "%(qty)d copies of '%(product)s' have been added to your basket"
+            ) % {"qty": line.quantity, "product": line.product}
         else:
             msg = _("'%s' has been added to your basket") % line.product
 
@@ -608,9 +631,10 @@ class AnonymousOrderDetailView(generic.DetailView):
 
     def get_object(self, queryset=None):
         # Check URL hash matches that for order to prevent spoof attacks
-        order = get_object_or_404(self.model, user=None,
-                                  number=self.kwargs['order_number'])
-        if not order.check_verification_hash(self.kwargs['hash']):
+        order = get_object_or_404(
+            self.model, user=None, number=self.kwargs["order_number"]
+        )
+        if not order.check_verification_hash(self.kwargs["hash"]):
             raise http.Http404()
         return order
 
@@ -619,13 +643,15 @@ class AnonymousOrderDetailView(generic.DetailView):
 # Address book
 # ------------
 
+
 class AddressListView(PageTitleMixin, generic.ListView):
     """Customer address book"""
+
     context_object_name = "addresses"
-    template_name = 'oscar/customer/address/address_list.html'
+    template_name = "oscar/customer/address/address_list.html"
     paginate_by = settings.OSCAR_ADDRESSES_PER_PAGE
-    active_tab = 'addresses'
-    page_title = _('Address Book')
+    active_tab = "addresses"
+    page_title = _("Address Book")
 
     def get_queryset(self):
         """Return customer's addresses"""
@@ -635,68 +661,65 @@ class AddressListView(PageTitleMixin, generic.ListView):
 class AddressCreateView(PageTitleMixin, generic.CreateView):
     form_class = UserAddressForm
     model = UserAddress
-    template_name = 'oscar/customer/address/address_form.html'
-    active_tab = 'addresses'
-    page_title = _('Add a new address')
-    success_url = reverse_lazy('customer:address-list')
+    template_name = "oscar/customer/address/address_form.html"
+    active_tab = "addresses"
+    page_title = _("Add a new address")
+    success_url = reverse_lazy("customer:address-list")
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['user'] = self.request.user
+        kwargs["user"] = self.request.user
         return kwargs
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
-        ctx['title'] = _('Add a new address')
+        ctx["title"] = _("Add a new address")
         return ctx
 
     def get_success_url(self):
-        messages.success(self.request,
-                         _("Address '%s' created") % self.object.summary)
+        messages.success(self.request, _("Address '%s' created") % self.object.summary)
         return super().get_success_url()
 
 
 class AddressUpdateView(PageTitleMixin, generic.UpdateView):
     form_class = UserAddressForm
     model = UserAddress
-    template_name = 'oscar/customer/address/address_form.html'
-    active_tab = 'addresses'
-    page_title = _('Edit address')
-    success_url = reverse_lazy('customer:address-list')
+    template_name = "oscar/customer/address/address_form.html"
+    active_tab = "addresses"
+    page_title = _("Edit address")
+    success_url = reverse_lazy("customer:address-list")
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['user'] = self.request.user
+        kwargs["user"] = self.request.user
         return kwargs
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
-        ctx['title'] = _('Edit address')
+        ctx["title"] = _("Edit address")
         return ctx
 
     def get_queryset(self):
         return self.request.user.addresses.all()
 
     def get_success_url(self):
-        messages.success(self.request,
-                         _("Address '%s' updated") % self.object.summary)
+        messages.success(self.request, _("Address '%s' updated") % self.object.summary)
         return super().get_success_url()
 
 
 class AddressDeleteView(PageTitleMixin, generic.DeleteView):
     model = UserAddress
     template_name = "oscar/customer/address/address_delete.html"
-    page_title = _('Delete address?')
-    active_tab = 'addresses'
-    context_object_name = 'address'
-    success_url = reverse_lazy('customer:address-list')
+    page_title = _("Delete address?")
+    active_tab = "addresses"
+    context_object_name = "address"
+    success_url = reverse_lazy("customer:address-list")
 
     def get_queryset(self):
         return UserAddress._default_manager.filter(user=self.request.user)
 
     def get_success_url(self):
-        messages.success(self.request,
-                         _("Address '%s' deleted") % self.object.summary)
+        messages.success(self.request, _("Address '%s' deleted") % self.object.summary)
         return super().get_success_url()
 
 
@@ -704,21 +727,20 @@ class AddressChangeStatusView(generic.RedirectView):
     """
     Sets an address as default_for_(billing|shipping)
     """
-    url = reverse_lazy('customer:address-list')
+
+    url = reverse_lazy("customer:address-list")
     permanent = False
 
-    def get(self, request, pk=None, action=None, *args, **kwargs):
-        address = get_object_or_404(UserAddress, user=self.request.user,
-                                    pk=pk)
+    def get(self, request, *args, pk=None, action=None, **kwargs):
+        address = get_object_or_404(UserAddress, user=self.request.user, pk=pk)
         #  We don't want the user to set an address as the default shipping
         #  address, though they should be able to set it as their billing
         #  address.
         if address.country.is_shipping_country:
-            setattr(address, 'is_%s' % action, True)
-        elif action == 'default_for_billing':
-            setattr(address, 'is_default_for_billing', True)
+            setattr(address, "is_%s" % action, True)
+        elif action == "default_for_billing":
+            setattr(address, "is_default_for_billing", True)
         else:
-            messages.error(request, _('We do not ship to this country'))
+            messages.error(request, _("We do not ship to this country"))
         address.save()
-        return super().get(
-            request, *args, **kwargs)
+        return super().get(request, *args, **kwargs)

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

@@ -6,24 +6,31 @@ from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import (
-    CreateView, DeleteView, FormView, ListView, UpdateView, View)
+    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
 
-WishList = get_model('wishlists', 'WishList')
-Line = get_model('wishlists', 'Line')
-Product = get_model('catalogue', 'Product')
-WishListForm = get_class('wishlists.forms', 'WishListForm')
+WishList = get_model("wishlists", "WishList")
+Line = get_model("wishlists", "Line")
+Product = get_model("catalogue", "Product")
+WishListForm = get_class("wishlists.forms", "WishListForm")
 LineFormset, WishListSharedEmailFormset = get_classes(
-    'wishlists.formsets', ('LineFormset', 'WishListSharedEmailFormset'))
-PageTitleMixin = get_class('customer.mixins', 'PageTitleMixin')
+    "wishlists.formsets", ("LineFormset", "WishListSharedEmailFormset")
+)
+PageTitleMixin = get_class("customer.mixins", "PageTitleMixin")
 
 
 class WishListListView(PageTitleMixin, ListView):
     context_object_name = active_tab = "wishlists"
-    template_name = 'oscar/customer/wishlists/wishlists_list.html'
-    page_title = _('Wish Lists')
+    template_name = "oscar/customer/wishlists/wishlists_list.html"
+    page_title = _("Wish Lists")
 
     def get_queryset(self):
         """
@@ -41,12 +48,14 @@ class WishListDetailView(PageTitleMixin, FormView):
     It is implemented as FormView because it's easier to adapt a FormView to
     display a product then adapt a DetailView to handle form validation.
     """
-    template_name = 'oscar/customer/wishlists/wishlists_detail.html'
+
+    template_name = "oscar/customer/wishlists/wishlists_detail.html"
     active_tab = "wishlists"
     form_class = LineFormset
 
     def dispatch(self, request, *args, **kwargs):
-        self.object = self.get_wishlist_or_404(kwargs['key'], request.user)
+        # pylint: disable=attribute-defined-outside-init
+        self.object = self.get_wishlist_or_404(kwargs["key"], request.user)
         return super().dispatch(request, *args, **kwargs)
 
     def get_wishlist_or_404(self, key, user):
@@ -61,25 +70,24 @@ class WishListDetailView(PageTitleMixin, FormView):
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['instance'] = self.object
+        kwargs["instance"] = self.object
         return kwargs
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
-        ctx['wishlist'] = self.object
-        other_wishlists = self.request.user.wishlists.exclude(
-            pk=self.object.pk)
-        ctx['other_wishlists'] = other_wishlists
+        ctx["wishlist"] = self.object
+        other_wishlists = self.request.user.wishlists.exclude(pk=self.object.pk)
+        ctx["other_wishlists"] = other_wishlists
         return ctx
 
     def form_valid(self, form):
         for subform in form:
-            if subform.cleaned_data['quantity'] <= 0:
+            if subform.cleaned_data["quantity"] <= 0:
                 subform.instance.delete()
             else:
                 subform.save()
-        messages.success(self.request, _('Quantities updated.'))
-        return redirect('customer:wishlists-detail', key=self.object.key)
+        messages.success(self.request, _("Quantities updated."))
+        return redirect("customer:wishlists-detail", key=self.object.key)
 
 
 class WishListCreateUpdateViewMixin(PageTitleMixin):
@@ -89,6 +97,7 @@ class WishListCreateUpdateViewMixin(PageTitleMixin):
     if both forms are valid. If one of the forms is not valid, the user will be redirected to the original
     view with form errors.
     """
+
     def process_wishlist_forms(self, wishlist_form, shared_emails_formset):
         wishlist = wishlist_form.save()
 
@@ -104,11 +113,15 @@ class WishListCreateUpdateViewMixin(PageTitleMixin):
 
         if wishlist.shared_emails.exists() and wishlist.visibility != WishList.SHARED:
             if wishlist.visibility == WishList.PRIVATE:
-                msg = _("The shared accounts won't be able to access your wishlist "
-                        "because the visiblity is set to private.")
+                msg = _(
+                    "The shared accounts won't be able to access your wishlist "
+                    "because the visiblity is set to private."
+                )
             elif wishlist.visibility == WishList.PUBLIC:
-                msg = _("You have added shared accounts to your wishlist but the visiblity "
-                        "is public, this means everyone with a link has access to it.")
+                msg = _(
+                    "You have added shared accounts to your wishlist but the visiblity "
+                    "is public, this means everyone with a link has access to it."
+                )
             messages.warning(self.request, msg)
 
         return wishlist
@@ -123,13 +136,17 @@ class WishListCreateUpdateViewMixin(PageTitleMixin):
             self.object = None
 
         form = self.get_form()
-        shared_emails_formset = WishListSharedEmailFormset(request.POST, instance=self.object)
+        shared_emails_formset = WishListSharedEmailFormset(
+            request.POST, instance=self.object
+        )
 
         if form.is_valid() and shared_emails_formset.is_valid():
             wishlist = self.process_wishlist_forms(form, shared_emails_formset)
             return self.form_valid(wishlist)
 
-        context = self.get_context_data(form=form, shared_emails_formset=shared_emails_formset)
+        context = self.get_context_data(
+            form=form, shared_emails_formset=shared_emails_formset
+        )
         return self.render_to_response(context)
 
 
@@ -140,27 +157,26 @@ class WishListCreateView(WishListCreateUpdateViewMixin, CreateView):
     If a product ID is passed as a kwargs, then this product will be added to
     the wishlist.
     """
+
     model = WishList
-    template_name = 'oscar/customer/wishlists/wishlists_form.html'
+    template_name = "oscar/customer/wishlists/wishlists_form.html"
     active_tab = "wishlists"
-    page_title = _('Create a new wish list')
+    page_title = _("Create a new wish list")
     form_class = WishListForm
     product = None
 
     def dispatch(self, request, *args, **kwargs):
-        if 'product_pk' in kwargs:
+        if "product_pk" in kwargs:
             try:
-                self.product = Product.objects.get(pk=kwargs['product_pk'])
+                self.product = Product.objects.get(pk=kwargs["product_pk"])
             except ObjectDoesNotExist:
-                messages.error(
-                    request, _("The requested product no longer exists"))
-                return redirect('wishlists-create')
-        return super().dispatch(
-            request, *args, **kwargs)
+                messages.error(request, _("The requested product no longer exists"))
+                return redirect("wishlists-create")
+        return super().dispatch(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
-        ctx['product'] = self.product
+        ctx["product"] = self.product
 
         # Invalid post response passes this to the context.
         if "shared_emails_formset" not in kwargs:
@@ -170,7 +186,7 @@ class WishListCreateView(WishListCreateUpdateViewMixin, CreateView):
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['user'] = self.request.user
+        kwargs["user"] = self.request.user
         return kwargs
 
     def form_valid(self, form):
@@ -181,9 +197,9 @@ class WishListCreateView(WishListCreateUpdateViewMixin, CreateView):
         wishlist = form
         if self.product:
             wishlist.add(self.product)
-            msg = _("Your wishlist has been created and '%(name)s "
-                    "has been added") \
-                % {'name': self.product.get_title()}
+            msg = _("Your wishlist has been created and '%(name)s has been added") % {
+                "name": self.product.get_title()
+            }
         else:
             msg = _("Your wishlist has been created")
         messages.success(self.request, msg)
@@ -197,7 +213,7 @@ class WishListCreateWithProductView(View):
     """
 
     def post(self, request, *args, **kwargs):
-        product = get_object_or_404(Product, pk=kwargs['product_pk'])
+        product = get_object_or_404(Product, pk=kwargs["product_pk"])
         wishlists = request.user.wishlists.all()
         if len(wishlists) == 0:
             wishlist = request.user.wishlists.create()
@@ -208,28 +224,31 @@ class WishListCreateWithProductView(View):
             wishlist = wishlists[0]
         wishlist.add(product)
         messages.success(
-            request, _("%(title)s has been added to your wishlist") % {
-                'title': product.get_title()})
+            request,
+            _("%(title)s has been added to your wishlist")
+            % {"title": product.get_title()},
+        )
         return redirect_to_referrer(request, wishlist.get_absolute_url())
 
 
 class WishListUpdateView(WishListCreateUpdateViewMixin, UpdateView):
     model = WishList
-    template_name = 'oscar/customer/wishlists/wishlists_form.html'
+    template_name = "oscar/customer/wishlists/wishlists_form.html"
     active_tab = "wishlists"
     form_class = WishListForm
-    context_object_name = 'wishlist'
+    context_object_name = "wishlist"
 
     def get_page_title(self):
         return self.object.name
 
     def get_object(self, queryset=None):
-        return get_object_or_404(WishList, owner=self.request.user,
-                                 key=self.kwargs['key'])
+        return get_object_or_404(
+            WishList, owner=self.request.user, key=self.kwargs["key"]
+        )
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['user'] = self.request.user
+        kwargs["user"] = self.request.user
         return kwargs
 
     def get_context_data(self, **kwargs):
@@ -237,15 +256,17 @@ class WishListUpdateView(WishListCreateUpdateViewMixin, UpdateView):
 
         # Invalid post response passes this to the context.
         if "shared_emails_formset" not in kwargs:
-            ctx["shared_emails_formset"] = WishListSharedEmailFormset(instance=self.object)
+            ctx["shared_emails_formset"] = WishListSharedEmailFormset(
+                instance=self.object
+            )
 
         return ctx
 
     def get_success_url(self):
         messages.success(
-            self.request, _("Your '%s' wishlist has been updated")
-            % self.object.name)
-        return reverse('customer:wishlists-list')
+            self.request, _("Your '%s' wishlist has been updated") % self.object.name
+        )
+        return reverse("customer:wishlists-list")
 
     def form_valid(self, form):
         return redirect(self.get_success_url())
@@ -253,21 +274,22 @@ class WishListUpdateView(WishListCreateUpdateViewMixin, UpdateView):
 
 class WishListDeleteView(PageTitleMixin, DeleteView):
     model = WishList
-    template_name = 'oscar/customer/wishlists/wishlists_delete.html'
+    template_name = "oscar/customer/wishlists/wishlists_delete.html"
     active_tab = "wishlists"
 
     def get_page_title(self):
-        return _('Delete %s') % self.object.name
+        return _("Delete %s") % self.object.name
 
     def get_object(self, queryset=None):
-        return get_object_or_404(WishList, owner=self.request.user,
-                                 key=self.kwargs['key'])
+        return get_object_or_404(
+            WishList, owner=self.request.user, key=self.kwargs["key"]
+        )
 
     def get_success_url(self):
         messages.success(
-            self.request, _("Your '%s' wish list has been deleted")
-            % self.object.name)
-        return reverse('customer:wishlists-list')
+            self.request, _("Your '%s' wish list has been deleted") % self.object.name
+        )
+        return reverse("customer:wishlists-list")
 
 
 class WishListAddProduct(View):
@@ -279,15 +301,17 @@ class WishListAddProduct(View):
     - If the product is already in the wish list, its quantity is increased.
     """
 
+    # pylint: disable=attribute-defined-outside-init
     def dispatch(self, request, *args, **kwargs):
-        self.product = get_object_or_404(Product, pk=kwargs['product_pk'])
+        self.product = get_object_or_404(Product, pk=kwargs["product_pk"])
         self.wishlist = self.get_or_create_wishlist(request, *args, **kwargs)
         return super().dispatch(request)
 
     def get_or_create_wishlist(self, request, *args, **kwargs):
-        if 'key' in kwargs:
+        if "key" in kwargs:
             wishlist = get_object_or_404(
-                WishList, key=kwargs['key'], owner=request.user)
+                WishList, key=kwargs["key"], owner=request.user
+            )
         else:
             wishlists = request.user.wishlists.all()[:1]
             if not wishlists:
@@ -311,8 +335,7 @@ class WishListAddProduct(View):
         self.wishlist.add(self.product)
         msg = _("'%s' was added to your wish list.") % self.product.get_title()
         messages.success(self.request, msg)
-        return redirect_to_referrer(
-            self.request, self.product.get_absolute_url())
+        return redirect_to_referrer(self.request, self.product.get_absolute_url())
 
 
 class LineMixin(object):
@@ -351,68 +374,72 @@ class LineMixin(object):
 
 
 class WishListRemoveProduct(LineMixin, PageTitleMixin, DeleteView):
-    template_name = 'oscar/customer/wishlists/wishlists_delete_product.html'
+    template_name = "oscar/customer/wishlists/wishlists_delete_product.html"
     active_tab = "wishlists"
 
     def get_page_title(self):
-        return _('Remove %s') % self.object.get_title()
+        return _("Remove %s") % self.object.get_title()
 
     def get_object(self, queryset=None):
         self.fetch_line(
             self.request.user,
-            self.kwargs['key'],
-            self.kwargs.get('line_pk'),
-            self.kwargs.get('product_pk')
+            self.kwargs["key"],
+            self.kwargs.get("line_pk"),
+            self.kwargs.get("product_pk"),
         )
         return self.line
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
-        ctx['wishlist'] = self.wishlist
-        ctx['product'] = self.product
+        ctx["wishlist"] = self.wishlist
+        ctx["product"] = self.product
         return ctx
 
     def get_success_url(self):
         msg = _("'%(title)s' was removed from your '%(name)s' wish list") % {
-            'title': self.line.get_title(),
-            'name': self.wishlist.name}
+            "title": self.line.get_title(),
+            "name": self.wishlist.name,
+        }
         messages.success(self.request, msg)
 
         # We post directly to this view on product pages; and should send the
         # user back there if that was the case
-        referrer = safe_referrer(self.request, '')
-        if (referrer and self.product
-                and self.product.get_absolute_url() in referrer):
+        referrer = safe_referrer(self.request, "")
+        if referrer and self.product and self.product.get_absolute_url() in referrer:
             return referrer
         else:
             return reverse(
-                'customer:wishlists-detail', kwargs={'key': self.wishlist.key})
+                "customer:wishlists-detail", kwargs={"key": self.wishlist.key}
+            )
 
 
 class WishListMoveProductToAnotherWishList(LineMixin, View):
-
     def dispatch(self, request, *args, **kwargs):
-        self.fetch_line(request.user, kwargs['key'], line_pk=kwargs['line_pk'])
+        self.fetch_line(request.user, kwargs["key"], line_pk=kwargs["line_pk"])
         return super().dispatch(request, *args, **kwargs)
 
     def get(self, request, *args, **kwargs):
         to_wishlist = get_object_or_404(
-            WishList, owner=request.user, key=kwargs['to_key'])
+            WishList, owner=request.user, key=kwargs["to_key"]
+        )
 
         if to_wishlist.lines.filter(product=self.line.product).count() > 0:
             msg = _("Wish list '%(name)s' already containing '%(title)s'") % {
-                'title': self.product.get_title(),
-                'name': to_wishlist.name}
+                "title": self.product.get_title(),
+                "name": to_wishlist.name,
+            }
             messages.error(self.request, msg)
         else:
             self.line.wishlist = to_wishlist
             self.line.save()
 
             msg = _("'%(title)s' moved to '%(name)s' wishlist") % {
-                'title': self.product.get_title(),
-                'name': to_wishlist.name}
+                "title": self.product.get_title(),
+                "name": to_wishlist.name,
+            }
             messages.success(self.request, msg)
 
         default_url = reverse(
-            'customer:wishlists-detail', kwargs={'key': self.wishlist.key})
+            "customer:wishlists-detail", kwargs={"key": self.wishlist.key}
+        )
         return redirect_to_referrer(self.request, default_url)

src/oscar/apps/dashboard/__init__.py

@@ -1 +1 @@
-default_app_config = 'oscar.apps.dashboard.apps.DashboardConfig'
+default_app_config = "oscar.apps.dashboard.apps.DashboardConfig"

src/oscar/apps/dashboard/apps.py

@@ -7,50 +7,53 @@ from oscar.core.loading import get_class
 
 
 class DashboardConfig(OscarDashboardConfig):
-    label = 'dashboard'
-    name = 'oscar.apps.dashboard'
-    verbose_name = _('Dashboard')
+    label = "dashboard"
+    name = "oscar.apps.dashboard"
+    verbose_name = _("Dashboard")
 
-    namespace = 'dashboard'
+    namespace = "dashboard"
     permissions_map = {
-        'index': (['is_staff'], ['partner.dashboard_access']),
+        "index": (["is_staff"], ["partner.dashboard_access"]),
     }
 
+    # pylint: disable=attribute-defined-outside-init
     def ready(self):
-        self.index_view = get_class('dashboard.views', 'IndexView')
-        self.login_view = get_class('dashboard.views', 'LoginView')
-
-        self.catalogue_app = apps.get_app_config('catalogue_dashboard')
-        self.reports_app = apps.get_app_config('reports_dashboard')
-        self.orders_app = apps.get_app_config('orders_dashboard')
-        self.users_app = apps.get_app_config('users_dashboard')
-        self.pages_app = apps.get_app_config('pages_dashboard')
-        self.partners_app = apps.get_app_config('partners_dashboard')
-        self.offers_app = apps.get_app_config('offers_dashboard')
-        self.ranges_app = apps.get_app_config('ranges_dashboard')
-        self.reviews_app = apps.get_app_config('reviews_dashboard')
-        self.vouchers_app = apps.get_app_config('vouchers_dashboard')
-        self.comms_app = apps.get_app_config('communications_dashboard')
-        self.shipping_app = apps.get_app_config('shipping_dashboard')
+        self.index_view = get_class("dashboard.views", "IndexView")
+        self.login_view = get_class("dashboard.views", "LoginView")
+
+        self.catalogue_app = apps.get_app_config("catalogue_dashboard")
+        self.reports_app = apps.get_app_config("reports_dashboard")
+        self.orders_app = apps.get_app_config("orders_dashboard")
+        self.users_app = apps.get_app_config("users_dashboard")
+        self.pages_app = apps.get_app_config("pages_dashboard")
+        self.partners_app = apps.get_app_config("partners_dashboard")
+        self.offers_app = apps.get_app_config("offers_dashboard")
+        self.ranges_app = apps.get_app_config("ranges_dashboard")
+        self.reviews_app = apps.get_app_config("reviews_dashboard")
+        self.vouchers_app = apps.get_app_config("vouchers_dashboard")
+        self.comms_app = apps.get_app_config("communications_dashboard")
+        self.shipping_app = apps.get_app_config("shipping_dashboard")
 
     def get_urls(self):
         from django.contrib.auth import views as auth_views
 
         urls = [
-            path('', self.index_view.as_view(), name='index'),
-            path('catalogue/', include(self.catalogue_app.urls[0])),
-            path('reports/', include(self.reports_app.urls[0])),
-            path('orders/', include(self.orders_app.urls[0])),
-            path('users/', include(self.users_app.urls[0])),
-            path('pages/', include(self.pages_app.urls[0])),
-            path('partners/', include(self.partners_app.urls[0])),
-            path('offers/', include(self.offers_app.urls[0])),
-            path('ranges/', include(self.ranges_app.urls[0])),
-            path('reviews/', include(self.reviews_app.urls[0])),
-            path('vouchers/', include(self.vouchers_app.urls[0])),
-            path('comms/', include(self.comms_app.urls[0])),
-            path('shipping/', include(self.shipping_app.urls[0])),
-            path('login/', self.login_view.as_view(), name='login'),
-            path('logout/', auth_views.LogoutView.as_view(next_page='/'), name='logout'),
+            path("", self.index_view.as_view(), name="index"),
+            path("catalogue/", include(self.catalogue_app.urls[0])),
+            path("reports/", include(self.reports_app.urls[0])),
+            path("orders/", include(self.orders_app.urls[0])),
+            path("users/", include(self.users_app.urls[0])),
+            path("pages/", include(self.pages_app.urls[0])),
+            path("partners/", include(self.partners_app.urls[0])),
+            path("offers/", include(self.offers_app.urls[0])),
+            path("ranges/", include(self.ranges_app.urls[0])),
+            path("reviews/", include(self.reviews_app.urls[0])),
+            path("vouchers/", include(self.vouchers_app.urls[0])),
+            path("comms/", include(self.comms_app.urls[0])),
+            path("shipping/", include(self.shipping_app.urls[0])),
+            path("login/", self.login_view.as_view(), name="login"),
+            path(
+                "logout/", auth_views.LogoutView.as_view(next_page="/"), name="logout"
+            ),
         ]
         return self.post_process_urls(urls)

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

@@ -1,2 +1 @@
-default_app_config = (
-    'oscar.apps.dashboard.catalogue.apps.CatalogueDashboardConfig')
+default_app_config = "oscar.apps.dashboard.catalogue.apps.CatalogueDashboardConfig"

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

@@ -6,146 +6,225 @@ from oscar.core.loading import get_class
 
 
 class CatalogueDashboardConfig(OscarDashboardConfig):
-    label = 'catalogue_dashboard'
-    name = 'oscar.apps.dashboard.catalogue'
-    verbose_name = _('Catalogue')
+    label = "catalogue_dashboard"
+    name = "oscar.apps.dashboard.catalogue"
+    verbose_name = _("Catalogue")
 
-    default_permissions = ['is_staff', ]
+    default_permissions = [
+        "is_staff",
+    ]
     permissions_map = _map = {
-        'catalogue-product': (['is_staff'], ['partner.dashboard_access']),
-        'catalogue-product-create': (['is_staff'],
-                                     ['partner.dashboard_access']),
-        'catalogue-product-list': (['is_staff'], ['partner.dashboard_access']),
-        'catalogue-product-delete': (['is_staff'],
-                                     ['partner.dashboard_access']),
-        'catalogue-product-lookup': (['is_staff'],
-                                     ['partner.dashboard_access']),
+        "catalogue-product": (["is_staff"], ["partner.dashboard_access"]),
+        "catalogue-product-create": (["is_staff"], ["partner.dashboard_access"]),
+        "catalogue-product-list": (["is_staff"], ["partner.dashboard_access"]),
+        "catalogue-product-delete": (["is_staff"], ["partner.dashboard_access"]),
+        "catalogue-product-lookup": (["is_staff"], ["partner.dashboard_access"]),
     }
 
+    # pylint: disable=attribute-defined-outside-init
     def ready(self):
-        self.product_list_view = get_class('dashboard.catalogue.views',
-                                           'ProductListView')
-        self.product_lookup_view = get_class('dashboard.catalogue.views',
-                                             'ProductLookupView')
-        self.product_create_redirect_view = get_class('dashboard.catalogue.views',
-                                                      'ProductCreateRedirectView')
-        self.product_createupdate_view = get_class('dashboard.catalogue.views',
-                                                   'ProductCreateUpdateView')
-        self.product_delete_view = get_class('dashboard.catalogue.views',
-                                             'ProductDeleteView')
+        self.product_list_view = get_class(
+            "dashboard.catalogue.views", "ProductListView"
+        )
+        self.product_lookup_view = get_class(
+            "dashboard.catalogue.views", "ProductLookupView"
+        )
+        self.product_create_redirect_view = get_class(
+            "dashboard.catalogue.views", "ProductCreateRedirectView"
+        )
+        self.product_createupdate_view = get_class(
+            "dashboard.catalogue.views", "ProductCreateUpdateView"
+        )
+        self.product_delete_view = get_class(
+            "dashboard.catalogue.views", "ProductDeleteView"
+        )
 
-        self.product_class_create_view = get_class('dashboard.catalogue.views',
-                                                   'ProductClassCreateView')
-        self.product_class_update_view = get_class('dashboard.catalogue.views',
-                                                   'ProductClassUpdateView')
-        self.product_class_list_view = get_class('dashboard.catalogue.views',
-                                                 'ProductClassListView')
-        self.product_class_delete_view = get_class('dashboard.catalogue.views',
-                                                   'ProductClassDeleteView')
+        self.product_class_create_view = get_class(
+            "dashboard.catalogue.views", "ProductClassCreateView"
+        )
+        self.product_class_update_view = get_class(
+            "dashboard.catalogue.views", "ProductClassUpdateView"
+        )
+        self.product_class_list_view = get_class(
+            "dashboard.catalogue.views", "ProductClassListView"
+        )
+        self.product_class_delete_view = get_class(
+            "dashboard.catalogue.views", "ProductClassDeleteView"
+        )
 
-        self.category_list_view = get_class('dashboard.catalogue.views',
-                                            'CategoryListView')
-        self.category_detail_list_view = get_class('dashboard.catalogue.views',
-                                                   'CategoryDetailListView')
-        self.category_create_view = get_class('dashboard.catalogue.views',
-                                              'CategoryCreateView')
-        self.category_update_view = get_class('dashboard.catalogue.views',
-                                              'CategoryUpdateView')
-        self.category_delete_view = get_class('dashboard.catalogue.views',
-                                              'CategoryDeleteView')
+        self.category_list_view = get_class(
+            "dashboard.catalogue.views", "CategoryListView"
+        )
+        self.category_detail_list_view = get_class(
+            "dashboard.catalogue.views", "CategoryDetailListView"
+        )
+        self.category_create_view = get_class(
+            "dashboard.catalogue.views", "CategoryCreateView"
+        )
+        self.category_update_view = get_class(
+            "dashboard.catalogue.views", "CategoryUpdateView"
+        )
+        self.category_delete_view = get_class(
+            "dashboard.catalogue.views", "CategoryDeleteView"
+        )
 
-        self.stock_alert_view = get_class('dashboard.catalogue.views',
-                                          'StockAlertListView')
+        self.stock_alert_view = get_class(
+            "dashboard.catalogue.views", "StockAlertListView"
+        )
 
-        self.attribute_option_group_create_view = get_class('dashboard.catalogue.views',
-                                                            'AttributeOptionGroupCreateView')
-        self.attribute_option_group_list_view = get_class('dashboard.catalogue.views',
-                                                          'AttributeOptionGroupListView')
-        self.attribute_option_group_update_view = get_class('dashboard.catalogue.views',
-                                                            'AttributeOptionGroupUpdateView')
-        self.attribute_option_group_delete_view = get_class('dashboard.catalogue.views',
-                                                            'AttributeOptionGroupDeleteView')
+        self.attribute_option_group_create_view = get_class(
+            "dashboard.catalogue.views", "AttributeOptionGroupCreateView"
+        )
+        self.attribute_option_group_list_view = get_class(
+            "dashboard.catalogue.views", "AttributeOptionGroupListView"
+        )
+        self.attribute_option_group_update_view = get_class(
+            "dashboard.catalogue.views", "AttributeOptionGroupUpdateView"
+        )
+        self.attribute_option_group_delete_view = get_class(
+            "dashboard.catalogue.views", "AttributeOptionGroupDeleteView"
+        )
 
-        self.option_list_view = get_class('dashboard.catalogue.views', 'OptionListView')
-        self.option_create_view = get_class('dashboard.catalogue.views', 'OptionCreateView')
-        self.option_update_view = get_class('dashboard.catalogue.views', 'OptionUpdateView')
-        self.option_delete_view = get_class('dashboard.catalogue.views', 'OptionDeleteView')
+        self.option_list_view = get_class("dashboard.catalogue.views", "OptionListView")
+        self.option_create_view = get_class(
+            "dashboard.catalogue.views", "OptionCreateView"
+        )
+        self.option_update_view = get_class(
+            "dashboard.catalogue.views", "OptionUpdateView"
+        )
+        self.option_delete_view = get_class(
+            "dashboard.catalogue.views", "OptionDeleteView"
+        )
 
     def get_urls(self):
         urls = [
-            path('products/<int:pk>/', self.product_createupdate_view.as_view(), name='catalogue-product'),
-            path('products/create/', self.product_create_redirect_view.as_view(), name='catalogue-product-create'),
             path(
-                'products/create/<slug:product_class_slug>/',
+                "products/<int:pk>/",
                 self.product_createupdate_view.as_view(),
-                name='catalogue-product-create'),
+                name="catalogue-product",
+            ),
             path(
-                'products/<int:parent_pk>/create-variant/',
+                "products/create/",
+                self.product_create_redirect_view.as_view(),
+                name="catalogue-product-create",
+            ),
+            path(
+                "products/create/<slug:product_class_slug>/",
+                self.product_createupdate_view.as_view(),
+                name="catalogue-product-create",
+            ),
+            path(
+                "products/<int:parent_pk>/create-variant/",
                 self.product_createupdate_view.as_view(),
-                name='catalogue-product-create-child'),
-            path('products/<int:pk>/delete/', self.product_delete_view.as_view(), name='catalogue-product-delete'),
-            path('', self.product_list_view.as_view(), name='catalogue-product-list'),
-            path('stock-alerts/', self.stock_alert_view.as_view(), name='stock-alert-list'),
-            path('product-lookup/', self.product_lookup_view.as_view(), name='catalogue-product-lookup'),
-            path('categories/', self.category_list_view.as_view(), name='catalogue-category-list'),
-            path(
-                'categories/<int:pk>/',
+                name="catalogue-product-create-child",
+            ),
+            path(
+                "products/<int:pk>/delete/",
+                self.product_delete_view.as_view(),
+                name="catalogue-product-delete",
+            ),
+            path("", self.product_list_view.as_view(), name="catalogue-product-list"),
+            path(
+                "stock-alerts/",
+                self.stock_alert_view.as_view(),
+                name="stock-alert-list",
+            ),
+            path(
+                "product-lookup/",
+                self.product_lookup_view.as_view(),
+                name="catalogue-product-lookup",
+            ),
+            path(
+                "categories/",
+                self.category_list_view.as_view(),
+                name="catalogue-category-list",
+            ),
+            path(
+                "categories/<int:pk>/",
                 self.category_detail_list_view.as_view(),
-                name='catalogue-category-detail-list'),
+                name="catalogue-category-detail-list",
+            ),
             path(
-                'categories/create/', self.category_create_view.as_view(),
-                name='catalogue-category-create'),
+                "categories/create/",
+                self.category_create_view.as_view(),
+                name="catalogue-category-create",
+            ),
             path(
-                'categories/create/<int:parent>/',
+                "categories/create/<int:parent>/",
                 self.category_create_view.as_view(),
-                name='catalogue-category-create-child'),
+                name="catalogue-category-create-child",
+            ),
             path(
-                'categories/<int:pk>/update/',
+                "categories/<int:pk>/update/",
                 self.category_update_view.as_view(),
-                name='catalogue-category-update'),
+                name="catalogue-category-update",
+            ),
             path(
-                'categories/<int:pk>/delete/',
+                "categories/<int:pk>/delete/",
                 self.category_delete_view.as_view(),
-                name='catalogue-category-delete'),
+                name="catalogue-category-delete",
+            ),
             path(
-                'product-type/create/',
+                "product-type/create/",
                 self.product_class_create_view.as_view(),
-                name='catalogue-class-create'),
+                name="catalogue-class-create",
+            ),
             path(
-                'product-types/',
+                "product-types/",
                 self.product_class_list_view.as_view(),
-                name='catalogue-class-list'),
+                name="catalogue-class-list",
+            ),
             path(
-                'product-type/<int:pk>/update/',
+                "product-type/<int:pk>/update/",
                 self.product_class_update_view.as_view(),
-                name='catalogue-class-update'),
+                name="catalogue-class-update",
+            ),
             path(
-                'product-type/<int:pk>/delete/',
+                "product-type/<int:pk>/delete/",
                 self.product_class_delete_view.as_view(),
-                name='catalogue-class-delete'),
+                name="catalogue-class-delete",
+            ),
             path(
-                'attribute-option-group/create/',
+                "attribute-option-group/create/",
                 self.attribute_option_group_create_view.as_view(),
-                name='catalogue-attribute-option-group-create'),
+                name="catalogue-attribute-option-group-create",
+            ),
             path(
-                'attribute-option-group/',
+                "attribute-option-group/",
                 self.attribute_option_group_list_view.as_view(),
-                name='catalogue-attribute-option-group-list'),
+                name="catalogue-attribute-option-group-list",
+            ),
             # The RelatedFieldWidgetWrapper code does something funny with
             # placeholder urls, so it does need to match more than just a pk
             path(
-                'attribute-option-group/<str:pk>/update/',
+                "attribute-option-group/<str:pk>/update/",
                 self.attribute_option_group_update_view.as_view(),
-                name='catalogue-attribute-option-group-update'),
+                name="catalogue-attribute-option-group-update",
+            ),
             # The RelatedFieldWidgetWrapper code does something funny with
             # placeholder urls, so it does need to match more than just a pk
             path(
-                'attribute-option-group/<str:pk>/delete/',
+                "attribute-option-group/<str:pk>/delete/",
                 self.attribute_option_group_delete_view.as_view(),
-                name='catalogue-attribute-option-group-delete'),
-            path('option/', self.option_list_view.as_view(), name='catalogue-option-list'),
-            path('option/create/', self.option_create_view.as_view(), name='catalogue-option-create'),
-            path('option/<str:pk>/update/', self.option_update_view.as_view(), name='catalogue-option-update'),
-            path('option/<str:pk>/delete/', self.option_delete_view.as_view(), name='catalogue-option-delete'),
+                name="catalogue-attribute-option-group-delete",
+            ),
+            path(
+                "option/", self.option_list_view.as_view(), name="catalogue-option-list"
+            ),
+            path(
+                "option/create/",
+                self.option_create_view.as_view(),
+                name="catalogue-option-create",
+            ),
+            path(
+                "option/<str:pk>/update/",
+                self.option_update_view.as_view(),
+                name="catalogue-option-update",
+            ),
+            path(
+                "option/<str:pk>/delete/",
+                self.option_delete_view.as_view(),
+                name="catalogue-option-delete",
+            ),
         ]
         return self.post_process_urls(urls)

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

@@ -7,36 +7,49 @@ from oscar.core.loading import get_class, get_classes, get_model
 from oscar.core.utils import slugify
 from oscar.forms.widgets import DateTimePickerInput, ImageInput
 
-Product = get_model('catalogue', 'Product')
-ProductClass = get_model('catalogue', 'ProductClass')
-ProductAttribute = get_model('catalogue', 'ProductAttribute')
-Category = get_model('catalogue', 'Category')
-StockRecord = get_model('partner', 'StockRecord')
-ProductCategory = get_model('catalogue', 'ProductCategory')
-ProductImage = get_model('catalogue', 'ProductImage')
-ProductRecommendation = get_model('catalogue', 'ProductRecommendation')
-AttributeOptionGroup = get_model('catalogue', 'AttributeOptionGroup')
-AttributeOption = get_model('catalogue', 'AttributeOption')
-Option = get_model('catalogue', 'Option')
-ProductSelect = get_class('dashboard.catalogue.widgets', 'ProductSelect')
-(RelatedFieldWidgetWrapper,
- RelatedMultipleFieldWidgetWrapper) = get_classes('dashboard.widgets',
-                                                  ('RelatedFieldWidgetWrapper',
-                                                   'RelatedMultipleFieldWidgetWrapper'))
+Product = get_model("catalogue", "Product")
+ProductClass = get_model("catalogue", "ProductClass")
+ProductAttribute = get_model("catalogue", "ProductAttribute")
+Category = get_model("catalogue", "Category")
+StockRecord = get_model("partner", "StockRecord")
+ProductCategory = get_model("catalogue", "ProductCategory")
+ProductImage = get_model("catalogue", "ProductImage")
+ProductRecommendation = get_model("catalogue", "ProductRecommendation")
+AttributeOptionGroup = get_model("catalogue", "AttributeOptionGroup")
+AttributeOption = get_model("catalogue", "AttributeOption")
+Option = get_model("catalogue", "Option")
+ProductSelect = get_class("dashboard.catalogue.widgets", "ProductSelect")
+(RelatedFieldWidgetWrapper, RelatedMultipleFieldWidgetWrapper) = get_classes(
+    "dashboard.widgets",
+    ("RelatedFieldWidgetWrapper", "RelatedMultipleFieldWidgetWrapper"),
+)
 
 
 BaseCategoryForm = movenodeform_factory(
     Category,
-    fields=['name', 'slug', 'description', 'image', 'is_public', 'meta_title', 'meta_description'],
-    exclude=['ancestors_are_public'],
-    widgets={'meta_description': forms.Textarea(attrs={'class': 'no-widget-init'})})
+    fields=[
+        "name",
+        "slug",
+        "description",
+        "image",
+        "is_public",
+        "meta_title",
+        "meta_description",
+    ],
+    exclude=["ancestors_are_public"],
+    widgets={"meta_description": forms.Textarea(attrs={"class": "no-widget-init"})},
+)
 
 
 class SEOFormMixin:
-    seo_fields = ['meta_title', 'meta_description', 'slug']
+    seo_fields = ["meta_title", "meta_description", "slug"]
 
     def primary_form_fields(self):
-        return [field for field in self if not field.is_hidden and not self.is_seo_field(field)]
+        return [
+            field
+            for field in self
+            if not field.is_hidden and not self.is_seo_field(field)
+        ]
 
     def seo_form_fields(self):
         return [field for field in self if self.is_seo_field(field)]
@@ -48,9 +61,11 @@ class SEOFormMixin:
 class CategoryForm(SEOFormMixin, BaseCategoryForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if 'slug' in self.fields:
-            self.fields['slug'].required = False
-            self.fields['slug'].help_text = _('Leave blank to generate from category name')
+        if "slug" in self.fields:
+            self.fields["slug"].required = False
+            self.fields["slug"].help_text = _(
+                "Leave blank to generate from category name"
+            )
 
 
 class ProductClassSelectForm(forms.Form):
@@ -61,32 +76,31 @@ class ProductClassSelectForm(forms.Form):
     product_class = forms.ModelChoiceField(
         label=_("Create a new product of type"),
         empty_label=_("-- Choose type --"),
-        queryset=ProductClass.objects.all())
+        queryset=ProductClass.objects.all(),
+    )
 
     def __init__(self, *args, **kwargs):
         """
         If there's only one product class, pre-select it
         """
         super().__init__(*args, **kwargs)
-        qs = self.fields['product_class'].queryset
-        if not kwargs.get('initial') and len(qs) == 1:
-            self.fields['product_class'].initial = qs[0]
+        qs = self.fields["product_class"].queryset
+        if not kwargs.get("initial") and len(qs) == 1:
+            self.fields["product_class"].initial = qs[0]
 
 
 class ProductSearchForm(forms.Form):
-    upc = forms.CharField(max_length=64, required=False, label=_('UPC'))
-    title = forms.CharField(
-        max_length=255, required=False, label=_('Product title'))
+    upc = forms.CharField(max_length=64, required=False, label=_("UPC"))
+    title = forms.CharField(max_length=255, required=False, label=_("Product title"))
 
     def clean(self):
         cleaned_data = super().clean()
-        cleaned_data['upc'] = cleaned_data['upc'].strip()
-        cleaned_data['title'] = cleaned_data['title'].strip()
+        cleaned_data["upc"] = cleaned_data["upc"].strip()
+        cleaned_data["title"] = cleaned_data["title"].strip()
         return cleaned_data
 
 
 class StockRecordForm(forms.ModelForm):
-
     def __init__(self, product_class, user, *args, **kwargs):
         # The user kwarg is not used by stock StockRecordForm. We pass it
         # anyway in case one wishes to customise the partner queryset
@@ -95,79 +109,83 @@ class StockRecordForm(forms.ModelForm):
 
         # Restrict accessible partners for non-staff users
         if not self.user.is_staff:
-            self.fields['partner'].queryset = self.user.partners.all()
+            self.fields["partner"].queryset = self.user.partners.all()
 
         # If not tracking stock, we hide the fields
         if not product_class.track_stock:
-            for field_name in ['num_in_stock', 'low_stock_threshold']:
+            for field_name in ["num_in_stock", "low_stock_threshold"]:
                 if field_name in self.fields:
                     del self.fields[field_name]
         else:
-            for field_name in ['price', 'num_in_stock']:
+            for field_name in ["price", "num_in_stock"]:
                 if field_name in self.fields:
                     self.fields[field_name].required = True
 
     class Meta:
         model = StockRecord
         fields = [
-            'partner', 'partner_sku',
-            'price_currency', 'price',
-            'num_in_stock', 'low_stock_threshold',
+            "partner",
+            "partner_sku",
+            "price_currency",
+            "price",
+            "num_in_stock",
+            "low_stock_threshold",
         ]
 
 
 def _attr_text_field(attribute):
-    return forms.CharField(label=attribute.name,
-                           required=attribute.required)
+    return forms.CharField(label=attribute.name, required=attribute.required)
 
 
 def _attr_textarea_field(attribute):
-    return forms.CharField(label=attribute.name,
-                           widget=forms.Textarea(),
-                           required=attribute.required)
+    return forms.CharField(
+        label=attribute.name, widget=forms.Textarea(), required=attribute.required
+    )
 
 
 def _attr_integer_field(attribute):
-    return forms.IntegerField(label=attribute.name,
-                              required=attribute.required)
+    return forms.IntegerField(label=attribute.name, required=attribute.required)
 
 
 def _attr_boolean_field(attribute):
-    return forms.BooleanField(label=attribute.name,
-                              required=attribute.required)
+    return forms.BooleanField(label=attribute.name, required=attribute.required)
 
 
 def _attr_float_field(attribute):
-    return forms.FloatField(label=attribute.name,
-                            required=attribute.required)
+    return forms.FloatField(label=attribute.name, required=attribute.required)
 
 
 def _attr_date_field(attribute):
-    return forms.DateField(label=attribute.name,
-                           required=attribute.required,
-                           widget=forms.widgets.DateInput)
+    return forms.DateField(
+        label=attribute.name,
+        required=attribute.required,
+        widget=forms.widgets.DateInput,
+    )
 
 
 def _attr_datetime_field(attribute):
-    return forms.DateTimeField(label=attribute.name,
-                               required=attribute.required,
-                               widget=DateTimePickerInput())
+    return forms.DateTimeField(
+        label=attribute.name, required=attribute.required, widget=DateTimePickerInput()
+    )
 
 
 def _attr_option_field(attribute):
     return forms.ModelChoiceField(
         label=attribute.name,
         required=attribute.required,
-        queryset=attribute.option_group.options.all())
+        queryset=attribute.option_group.options.all(),
+    )
 
 
 def _attr_multi_option_field(attribute):
     return forms.ModelMultipleChoiceField(
         label=attribute.name,
         required=attribute.required,
-        queryset=attribute.option_group.options.all())
+        queryset=attribute.option_group.options.all(),
+    )
 
 
+# pylint: disable=unused-argument
 def _attr_entity_field(attribute):
     # Product entities don't have out-of-the-box supported in the ProductForm.
     # There is no ModelChoiceField for generic foreign keys, and there's no
@@ -177,18 +195,15 @@ def _attr_entity_field(attribute):
 
 
 def _attr_numeric_field(attribute):
-    return forms.FloatField(label=attribute.name,
-                            required=attribute.required)
+    return forms.FloatField(label=attribute.name, required=attribute.required)
 
 
 def _attr_file_field(attribute):
-    return forms.FileField(
-        label=attribute.name, required=attribute.required)
+    return forms.FileField(label=attribute.name, required=attribute.required)
 
 
 def _attr_image_field(attribute):
-    return forms.ImageField(
-        label=attribute.name, required=attribute.required)
+    return forms.ImageField(label=attribute.name, required=attribute.required)
 
 
 class ProductForm(SEOFormMixin, forms.ModelForm):
@@ -211,14 +226,22 @@ class ProductForm(SEOFormMixin, forms.ModelForm):
     class Meta:
         model = Product
         fields = [
-            'title', 'upc', 'description', 'is_public', 'is_discountable', 'structure', 'slug', 'meta_title',
-            'meta_description']
+            "title",
+            "upc",
+            "description",
+            "is_public",
+            "is_discountable",
+            "structure",
+            "slug",
+            "meta_title",
+            "meta_description",
+        ]
         widgets = {
-            'structure': forms.HiddenInput(),
-            'meta_description': forms.Textarea(attrs={'class': 'no-widget-init'})
+            "structure": forms.HiddenInput(),
+            "meta_description": forms.Textarea(attrs={"class": "no-widget-init"}),
         }
 
-    def __init__(self, product_class, data=None, parent=None, *args, **kwargs):
+    def __init__(self, product_class, *args, data=None, parent=None, **kwargs):
         self.set_initial(product_class, parent, kwargs)
         super().__init__(data, *args, **kwargs)
         if parent:
@@ -235,12 +258,13 @@ class ProductForm(SEOFormMixin, forms.ModelForm):
             self.instance.product_class = product_class
         self.add_attribute_fields(product_class, self.instance.is_parent)
 
-        if 'slug' in self.fields:
-            self.fields['slug'].required = False
-            self.fields['slug'].help_text = _('Leave blank to generate from product title')
-        if 'title' in self.fields:
-            self.fields['title'].widget = forms.TextInput(
-                attrs={'autocomplete': 'off'})
+        if "slug" in self.fields:
+            self.fields["slug"].required = False
+            self.fields["slug"].help_text = _(
+                "Leave blank to generate from product title"
+            )
+        if "title" in self.fields:
+            self.fields["title"].widget = forms.TextInput(attrs={"autocomplete": "off"})
 
     def set_initial(self, product_class, parent, kwargs):
         """
@@ -248,28 +272,27 @@ class ProductForm(SEOFormMixin, forms.ModelForm):
         and fetches initial values for the dynamically constructed attribute
         fields.
         """
-        if 'initial' not in kwargs:
-            kwargs['initial'] = {}
+        if "initial" not in kwargs:
+            kwargs["initial"] = {}
         self.set_initial_attribute_values(product_class, kwargs)
         if parent:
-            kwargs['initial']['structure'] = Product.CHILD
+            kwargs["initial"]["structure"] = Product.CHILD
 
     def set_initial_attribute_values(self, product_class, kwargs):
         """
         Update the kwargs['initial'] value to have the initial values based on
         the product instance's attributes
         """
-        instance = kwargs.get('instance')
+        instance = kwargs.get("instance")
         if instance is None:
             return
         for attribute in product_class.attributes.all():
             try:
-                value = instance.attribute_values.get(
-                    attribute=attribute).value
+                value = instance.attribute_values.get(attribute=attribute).value
             except exceptions.ObjectDoesNotExist:
                 pass
             else:
-                kwargs['initial']['attr_%s' % attribute.code] = value
+                kwargs["initial"]["attr_%s" % attribute.code] = value
 
     def add_attribute_fields(self, product_class, is_parent=False):
         """
@@ -279,10 +302,10 @@ class ProductForm(SEOFormMixin, forms.ModelForm):
         for attribute in product_class.attributes.all():
             field = self.get_attribute_field(attribute)
             if field:
-                self.fields['attr_%s' % attribute.code] = field
+                self.fields["attr_%s" % attribute.code] = field
                 # Attributes are not required for a parent product
                 if is_parent:
-                    self.fields['attr_%s' % attribute.code].required = False
+                    self.fields["attr_%s" % attribute.code].required = False
 
     def get_attribute_field(self, attribute):
         """
@@ -295,7 +318,7 @@ class ProductForm(SEOFormMixin, forms.ModelForm):
         Deletes any fields not needed for child products. Override this if
         you want to e.g. keep the description field.
         """
-        for field_name in ['description', 'is_discountable']:
+        for field_name in ["description", "is_discountable"]:
             if field_name in self.fields:
                 del self.fields[field_name]
 
@@ -305,7 +328,7 @@ class ProductForm(SEOFormMixin, forms.ModelForm):
         (which it does in _post_clean), which in turn validates attributes.
         """
         for attribute in self.instance.attr.get_all_attributes():
-            field_name = 'attr_%s' % attribute.code
+            field_name = "attr_%s" % attribute.code
             # An empty text field won't show up in cleaned_data.
             if field_name in self.cleaned_data:
                 value = self.cleaned_data[field_name]
@@ -314,67 +337,64 @@ class ProductForm(SEOFormMixin, forms.ModelForm):
 
 
 class StockAlertSearchForm(forms.Form):
-    status = forms.CharField(label=_('Status'))
+    status = forms.CharField(label=_("Status"))
 
 
 class ProductCategoryForm(forms.ModelForm):
-
     class Meta:
         model = ProductCategory
-        fields = ('category', )
+        fields = ("category",)
 
 
 class ProductImageForm(forms.ModelForm):
-
     class Meta:
         model = ProductImage
-        fields = ['product', 'original', 'caption', 'display_order']
+        fields = ["product", "original", "caption", "display_order"]
         # use ImageInput widget to create HTML displaying the
         # actual uploaded image and providing the upload dialog
         # when clicking on the actual image.
         widgets = {
-            'original': ImageInput(),
-            'display_order': forms.HiddenInput(),
+            "original": ImageInput(),
+            "display_order": forms.HiddenInput(),
         }
 
-    def __init__(self, data=None, *args, **kwargs):
-        self.prefix = kwargs.get('prefix', None)
-        instance = kwargs.get('instance', None)
+    def __init__(self, *args, data=None, **kwargs):
+        self.prefix = kwargs.get("prefix", None)
+        instance = kwargs.get("instance", None)
         if not instance:
-            initial = {'display_order': self.get_display_order()}
-            initial.update(kwargs.get('initial', {}))
-            kwargs['initial'] = initial
+            initial = {"display_order": self.get_display_order()}
+            initial.update(kwargs.get("initial", {}))
+            kwargs["initial"] = initial
         super().__init__(data, *args, **kwargs)
 
     def get_display_order(self):
-        return int(self.prefix.split('-').pop())
+        return int(self.prefix.split("-").pop())
 
 
 class ProductRecommendationForm(forms.ModelForm):
-
     class Meta:
         model = ProductRecommendation
-        fields = ['primary', 'recommendation', 'ranking']
+        fields = ["primary", "recommendation", "ranking"]
         widgets = {
-            'recommendation': ProductSelect,
+            "recommendation": ProductSelect,
         }
 
 
 class ProductClassForm(forms.ModelForm):
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        remote_field = self._meta.model._meta.get_field('options').remote_field
+        # pylint: disable=no-member
+        remote_field = self._meta.model._meta.get_field("options").remote_field
         self.fields["options"].widget = RelatedMultipleFieldWidgetWrapper(
-            self.fields["options"].widget, remote_field)
+            self.fields["options"].widget, remote_field
+        )
 
     class Meta:
         model = ProductClass
-        fields = ['name', 'requires_shipping', 'track_stock', 'options']
+        fields = ["name", "requires_shipping", "track_stock", "options"]
 
 
 class ProductAttributesForm(forms.ModelForm):
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
@@ -384,9 +404,11 @@ class ProductAttributesForm(forms.ModelForm):
 
         self.fields["option_group"].help_text = _("Select an option group")
 
-        remote_field = self._meta.model._meta.get_field('option_group').remote_field
+        # pylint: disable=no-member
+        remote_field = self._meta.model._meta.get_field("option_group").remote_field
         self.fields["option_group"].widget = RelatedFieldWidgetWrapper(
-            self.fields["option_group"].widget, remote_field)
+            self.fields["option_group"].widget, remote_field
+        )
 
     def clean_code(self):
         code = self.cleaned_data.get("code")
@@ -398,10 +420,13 @@ class ProductAttributesForm(forms.ModelForm):
         return code
 
     def clean(self):
-        attr_type = self.cleaned_data.get('type')
-        option_group = self.cleaned_data.get('option_group')
-        if attr_type in [ProductAttribute.OPTION, ProductAttribute.MULTI_OPTION] and not option_group:
-            self.add_error('option_group', _('An option group is required'))
+        attr_type = self.cleaned_data.get("type")
+        option_group = self.cleaned_data.get("option_group")
+        if (
+            attr_type in [ProductAttribute.OPTION, ProductAttribute.MULTI_OPTION]
+            and not option_group
+        ):
+            self.add_error("option_group", _("An option group is required"))
 
     class Meta:
         model = ProductAttribute
@@ -409,21 +434,18 @@ class ProductAttributesForm(forms.ModelForm):
 
 
 class AttributeOptionGroupForm(forms.ModelForm):
-
     class Meta:
         model = AttributeOptionGroup
-        fields = ['name']
+        fields = ["name"]
 
 
 class AttributeOptionForm(forms.ModelForm):
-
     class Meta:
         model = AttributeOption
-        fields = ['option']
+        fields = ["option"]
 
 
 class OptionForm(forms.ModelForm):
-
     class Meta:
         model = Option
-        fields = ['name', 'type', 'required', 'order', 'help_text', 'option_group']
+        fields = ["name", "type", "required", "order", "help_text", "option_group"]

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

@@ -5,49 +5,55 @@ from django.utils.translation import gettext_lazy as _
 
 from oscar.core.loading import get_classes, get_model
 
-Product = get_model('catalogue', 'Product')
-ProductClass = get_model('catalogue', 'ProductClass')
-ProductAttribute = get_model('catalogue', 'ProductAttribute')
-StockRecord = get_model('partner', 'StockRecord')
-ProductCategory = get_model('catalogue', 'ProductCategory')
-ProductImage = get_model('catalogue', 'ProductImage')
-ProductRecommendation = get_model('catalogue', 'ProductRecommendation')
-AttributeOptionGroup = get_model('catalogue', 'AttributeOptionGroup')
-AttributeOption = get_model('catalogue', 'AttributeOption')
-
-(StockRecordForm,
- ProductCategoryForm,
- ProductImageForm,
- ProductRecommendationForm,
- ProductAttributesForm,
- AttributeOptionForm) = \
-    get_classes('dashboard.catalogue.forms',
-                ('StockRecordForm',
-                 'ProductCategoryForm',
-                 'ProductImageForm',
-                 'ProductRecommendationForm',
-                 'ProductAttributesForm',
-                 'AttributeOptionForm'))
+Product = get_model("catalogue", "Product")
+ProductClass = get_model("catalogue", "ProductClass")
+ProductAttribute = get_model("catalogue", "ProductAttribute")
+StockRecord = get_model("partner", "StockRecord")
+ProductCategory = get_model("catalogue", "ProductCategory")
+ProductImage = get_model("catalogue", "ProductImage")
+ProductRecommendation = get_model("catalogue", "ProductRecommendation")
+AttributeOptionGroup = get_model("catalogue", "AttributeOptionGroup")
+AttributeOption = get_model("catalogue", "AttributeOption")
+
+(
+    StockRecordForm,
+    ProductCategoryForm,
+    ProductImageForm,
+    ProductRecommendationForm,
+    ProductAttributesForm,
+    AttributeOptionForm,
+) = get_classes(
+    "dashboard.catalogue.forms",
+    (
+        "StockRecordForm",
+        "ProductCategoryForm",
+        "ProductImageForm",
+        "ProductRecommendationForm",
+        "ProductAttributesForm",
+        "AttributeOptionForm",
+    ),
+)
 
 
 BaseStockRecordFormSet = inlineformset_factory(
-    Product, StockRecord, form=StockRecordForm, extra=1)
+    Product, StockRecord, form=StockRecordForm, extra=1
+)
 
 
 class StockRecordFormSet(BaseStockRecordFormSet):
-
     def __init__(self, product_class, user, *args, **kwargs):
         self.user = user
         self.require_user_stockrecord = not user.is_staff
         self.product_class = product_class
 
-        if not user.is_staff and \
-           'instance' in kwargs and \
-           'queryset' not in kwargs:
-            kwargs.update({
-                'queryset': StockRecord.objects.filter(product=kwargs['instance'],
-                                                       partner__in=user.partners.all())
-            })
+        if not user.is_staff and "instance" in kwargs and "queryset" not in kwargs:
+            kwargs.update(
+                {
+                    "queryset": StockRecord.objects.filter(
+                        product=kwargs["instance"], partner__in=user.partners.all()
+                    )
+                }
+            )
 
         super().__init__(*args, **kwargs)
         self.set_initial_data()
@@ -66,19 +72,17 @@ class StockRecordFormSet(BaseStockRecordFormSet):
         if self.require_user_stockrecord:
             try:
                 user_partner = self.user.partners.get()
-            except (exceptions.ObjectDoesNotExist,
-                    exceptions.MultipleObjectsReturned):
+            except (exceptions.ObjectDoesNotExist, exceptions.MultipleObjectsReturned):
                 pass
             else:
-                partner_field = self.forms[0].fields.get('partner', None)
+                partner_field = self.forms[0].fields.get("partner", None)
                 if partner_field and partner_field.initial is None:
                     partner_field.initial = user_partner
 
     def _construct_form(self, i, **kwargs):
-        kwargs['product_class'] = self.product_class
-        kwargs['user'] = self.user
-        return super()._construct_form(
-            i, **kwargs)
+        kwargs["product_class"] = self.product_class
+        kwargs["user"] = self.user
+        return super()._construct_form(i, **kwargs)
 
     def clean(self):
         """
@@ -88,22 +92,26 @@ class StockRecordFormSet(BaseStockRecordFormSet):
         if any(self.errors):
             return
         if self.require_user_stockrecord:
-            stockrecord_partners = set([form.cleaned_data.get('partner', None)
-                                        for form in self.forms])
+            stockrecord_partners = set(
+                [form.cleaned_data.get("partner", None) for form in self.forms]
+            )
             user_partners = set(self.user.partners.all())
             if not user_partners & stockrecord_partners:
                 raise exceptions.ValidationError(
-                    _("At least one stock record must be set to a partner that"
-                      " you're associated with."))
+                    _(
+                        "At least one stock record must be set to a partner that"
+                        " you're associated with."
+                    )
+                )
 
 
 BaseProductCategoryFormSet = inlineformset_factory(
-    Product, ProductCategory, form=ProductCategoryForm, extra=1,
-    can_delete=True)
+    Product, ProductCategory, form=ProductCategoryForm, extra=1, can_delete=True
+)
 
 
 class ProductCategoryFormSet(BaseProductCategoryFormSet):
-
+    # pylint: disable=unused-argument
     def __init__(self, product_class, user, *args, **kwargs):
         # This function just exists to drop the extra arguments
         super().__init__(*args, **kwargs)
@@ -111,51 +119,55 @@ class ProductCategoryFormSet(BaseProductCategoryFormSet):
     def clean(self):
         if not self.instance.is_child and self.get_num_categories() == 0:
             raise forms.ValidationError(
-                _("Stand-alone and parent products "
-                  "must have at least one category"))
+                _("Stand-alone and parent products must have at least one category")
+            )
         if self.instance.is_child and self.get_num_categories() > 0:
-            raise forms.ValidationError(
-                _("A child product should not have categories"))
+            raise forms.ValidationError(_("A child product should not have categories"))
 
     def get_num_categories(self):
         num_categories = 0
         for i in range(0, self.total_form_count()):
             form = self.forms[i]
-            if (hasattr(form, 'cleaned_data')
-                    and form.cleaned_data.get('category', None)
-                    and not form.cleaned_data.get('DELETE', False)):
+            if (
+                hasattr(form, "cleaned_data")
+                and form.cleaned_data.get("category", None)
+                and not form.cleaned_data.get("DELETE", False)
+            ):
                 num_categories += 1
         return num_categories
 
 
 BaseProductImageFormSet = inlineformset_factory(
-    Product, ProductImage, form=ProductImageForm, extra=2)
+    Product, ProductImage, form=ProductImageForm, extra=2
+)
 
 
 class ProductImageFormSet(BaseProductImageFormSet):
-
+    # pylint: disable=unused-argument
     def __init__(self, product_class, user, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
 
 BaseProductRecommendationFormSet = inlineformset_factory(
-    Product, ProductRecommendation, form=ProductRecommendationForm,
-    extra=5, fk_name="primary")
+    Product,
+    ProductRecommendation,
+    form=ProductRecommendationForm,
+    extra=5,
+    fk_name="primary",
+)
 
 
 class ProductRecommendationFormSet(BaseProductRecommendationFormSet):
-
+    # pylint: disable=unused-argument
     def __init__(self, product_class, user, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
 
-ProductAttributesFormSet = inlineformset_factory(ProductClass,
-                                                 ProductAttribute,
-                                                 form=ProductAttributesForm,
-                                                 extra=3)
+ProductAttributesFormSet = inlineformset_factory(
+    ProductClass, ProductAttribute, form=ProductAttributesForm, extra=3
+)
 
 
-AttributeOptionFormSet = inlineformset_factory(AttributeOptionGroup,
-                                               AttributeOption,
-                                               form=AttributeOptionForm,
-                                               extra=3)
+AttributeOptionFormSet = inlineformset_factory(
+    AttributeOptionGroup, AttributeOption, form=AttributeOptionForm, extra=3
+)

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

@@ -14,5 +14,6 @@ class PartnerProductFilterMixin:
             return queryset
 
         return queryset.filter(
-            Q(children__stockrecords__partner__users__pk=user.pk) | Q(stockrecords__partner__users__pk=user.pk)
+            Q(children__stockrecords__partner__users__pk=user.pk)
+            | Q(stockrecords__partner__users__pk=user.pk)
         ).distinct()

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

@@ -6,114 +6,139 @@ from django_tables2 import A, Column, LinkColumn, TemplateColumn
 
 from oscar.core.loading import get_class, get_model
 
-DashboardTable = get_class('dashboard.tables', 'DashboardTable')
-Product = get_model('catalogue', 'Product')
-Category = get_model('catalogue', 'Category')
-AttributeOptionGroup = get_model('catalogue', 'AttributeOptionGroup')
-Option = get_model('catalogue', 'Option')
+DashboardTable = get_class("dashboard.tables", "DashboardTable")
+Product = get_model("catalogue", "Product")
+Category = get_model("catalogue", "Category")
+AttributeOptionGroup = get_model("catalogue", "AttributeOptionGroup")
+Option = get_model("catalogue", "Option")
 
 
 class ProductTable(DashboardTable):
     title = TemplateColumn(
-        verbose_name=_('Title'),
-        template_name='oscar/dashboard/catalogue/product_row_title.html',
-        order_by='title', accessor=A('title'))
+        verbose_name=_("Title"),
+        template_name="oscar/dashboard/catalogue/product_row_title.html",
+        order_by="title",
+        accessor=A("title"),
+    )
     image = TemplateColumn(
-        verbose_name=_('Image'),
-        template_name='oscar/dashboard/catalogue/product_row_image.html',
-        orderable=False)
+        verbose_name=_("Image"),
+        template_name="oscar/dashboard/catalogue/product_row_image.html",
+        orderable=False,
+    )
     product_class = Column(
-        verbose_name=_('Product type'),
-        accessor=A('product_class'),
-        order_by='product_class__name')
+        verbose_name=_("Product type"),
+        accessor=A("product_class"),
+        order_by="product_class__name",
+    )
     variants = TemplateColumn(
         verbose_name=_("Variants"),
-        template_name='oscar/dashboard/catalogue/product_row_variants.html',
-        orderable=False
+        template_name="oscar/dashboard/catalogue/product_row_variants.html",
+        orderable=False,
     )
     stock_records = TemplateColumn(
-        verbose_name=_('Stock records'),
-        template_name='oscar/dashboard/catalogue/product_row_stockrecords.html',
-        orderable=False)
+        verbose_name=_("Stock records"),
+        template_name="oscar/dashboard/catalogue/product_row_stockrecords.html",
+        orderable=False,
+    )
     actions = TemplateColumn(
-        verbose_name=_('Actions'),
-        template_name='oscar/dashboard/catalogue/product_row_actions.html',
-        orderable=False)
+        verbose_name=_("Actions"),
+        template_name="oscar/dashboard/catalogue/product_row_actions.html",
+        orderable=False,
+    )
 
-    icon = 'fas fa-sitemap'
+    icon = "fas fa-sitemap"
 
     class Meta(DashboardTable.Meta):
         model = Product
-        fields = ('upc', 'is_public', 'date_updated')
-        sequence = ('title', 'upc', 'image', 'product_class', 'variants',
-                    'stock_records', '...', 'is_public', 'date_updated', 'actions')
-        order_by = '-date_updated'
+        fields = ("upc", "is_public", "date_updated")
+        sequence = (
+            "title",
+            "upc",
+            "image",
+            "product_class",
+            "variants",
+            "stock_records",
+            "...",
+            "is_public",
+            "date_updated",
+            "actions",
+        )
+        order_by = "-date_updated"
 
 
 class CategoryTable(DashboardTable):
-    name = LinkColumn('dashboard:catalogue-category-update', args=[A('pk')])
+    name = LinkColumn("dashboard:catalogue-category-update", args=[A("pk")])
     description = TemplateColumn(
         template_code='{{ record.description|default:""|striptags'
-                      '|cut:" "|truncatewords:6 }}')
+        '|cut:" "|truncatewords:6 }}'
+    )
     # mark_safe is needed because of
     # https://github.com/bradleyayers/django-tables2/issues/187
     num_children = LinkColumn(
-        'dashboard:catalogue-category-detail-list', args=[A('pk')],
-        verbose_name=mark_safe(_('Number of child categories')),
-        accessor='get_num_children',
-        orderable=False)
+        "dashboard:catalogue-category-detail-list",
+        args=[A("pk")],
+        verbose_name=mark_safe(_("Number of child categories")),
+        accessor="get_num_children",
+        orderable=False,
+    )
     actions = TemplateColumn(
-        template_name='oscar/dashboard/catalogue/category_row_actions.html',
-        orderable=False)
+        template_name="oscar/dashboard/catalogue/category_row_actions.html",
+        orderable=False,
+    )
 
     icon = "sitemap"
     caption = ngettext_lazy("%s Category", "%s Categories")
 
     class Meta(DashboardTable.Meta):
         model = Category
-        fields = ('name', 'description', 'is_public')
-        sequence = ('name', 'description', '...', 'is_public', 'actions')
+        fields = ("name", "description", "is_public")
+        sequence = ("name", "description", "...", "is_public", "actions")
 
 
 class AttributeOptionGroupTable(DashboardTable):
     name = TemplateColumn(
-        verbose_name=_('Name'),
-        template_name='oscar/dashboard/catalogue/attribute_option_group_row_name.html',
-        order_by='name')
+        verbose_name=_("Name"),
+        template_name="oscar/dashboard/catalogue/attribute_option_group_row_name.html",
+        order_by="name",
+    )
     option_summary = TemplateColumn(
-        verbose_name=_('Option summary'),
-        template_name='oscar/dashboard/catalogue/attribute_option_group_row_option_summary.html',
-        orderable=False)
+        verbose_name=_("Option summary"),
+        template_name="oscar/dashboard/catalogue/attribute_option_group_row_option_summary.html",
+        orderable=False,
+    )
     actions = TemplateColumn(
-        verbose_name=_('Actions'),
-        template_name='oscar/dashboard/catalogue/attribute_option_group_row_actions.html',
-        orderable=False)
+        verbose_name=_("Actions"),
+        template_name="oscar/dashboard/catalogue/attribute_option_group_row_actions.html",
+        orderable=False,
+    )
 
     icon = "sitemap"
     caption = ngettext_lazy("%s Attribute Option Group", "%s Attribute Option Groups")
 
     class Meta(DashboardTable.Meta):
         model = AttributeOptionGroup
-        fields = ('name',)
-        sequence = ('name', 'option_summary', 'actions')
+        fields = ("name",)
+        sequence = ("name", "option_summary", "actions")
         per_page = settings.OSCAR_DASHBOARD_ITEMS_PER_PAGE
 
 
 class OptionTable(DashboardTable):
     name = TemplateColumn(
-        verbose_name=_('Name'),
-        template_name='oscar/dashboard/catalogue/option_row_name.html',
-        order_by='name')
+        verbose_name=_("Name"),
+        template_name="oscar/dashboard/catalogue/option_row_name.html",
+        order_by="name",
+    )
     actions = TemplateColumn(
-        verbose_name=_('Actions'),
-        template_name='oscar/dashboard/catalogue/option_row_actions.html',
-        orderable=False)
+        verbose_name=_("Actions"),
+        template_name="oscar/dashboard/catalogue/option_row_actions.html",
+        orderable=False,
+    )
 
     icon = "reorder"
     caption = ngettext_lazy("%s Option", "%s Options")
 
     class Meta(DashboardTable.Meta):
         model = Option
-        fields = ('name', 'type', 'required')
-        sequence = ('name', 'type', 'required', 'actions')
+        fields = ("name", "type", "required")
+        sequence = ("name", "type", "required", "actions")
         per_page = settings.OSCAR_DASHBOARD_ITEMS_PER_PAGE