flake8

setup.cfg

@@ -7,9 +7,9 @@ testpaths = tests/
 
 [flake8]
 exclude = migrations
-ignore = F405,W503
+ignore = F405,W503,E731
 max-complexity = 10
-max-line-length=99
+max-line-length=159  
 
 [isort]
 line_length = 79

tests/_site/apps/customer/models.py

@@ -1 +1 @@
-from oscar.apps.customer.models import *
+from oscar.apps.customer.models import *  # noqa

tests/_site/apps/myapp/models.py

@@ -1,2 +1,2 @@
 class Goat(object):
-    pass
+    pass

tests/_site/apps/partner/models.py

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

tests/_site/apps/shipping/methods.py

@@ -1,2 +1,2 @@
 class Free(object):
-    pass
+    pass

tests/_site/myauth/models.py

@@ -41,7 +41,8 @@ class User(AbstractUser):
     """
     Custom user based on Oscar's AbstractUser
     """
-    username = models.CharField(_('username'), max_length=30, unique=True,
+    username = models.CharField(
+        _('username'), max_length=30, unique=True,
         help_text=_('Required. 30 characters or fewer. Letters, numbers and '
                     '@/./+/-/_ characters'),
         validators=[

tests/_site/shipping/methods.py

@@ -1,2 +1,2 @@
 class Free(object):
-    pass
+    pass

tests/dynamic_fixtures.py

@@ -1,11 +0,0 @@
-from django_dynamic_fixture.ddf import DataFixture
-from django_dynamic_fixture.fixture_algorithms.sequential_fixture import \
-    SequentialDataFixture
-
-class OscarDynamicDataFixtureClass(SequentialDataFixture):
-    """
-    This is need to support Oscar's PhoneNumberField: it's a custom type, so we
-    must provide values for testing
-    """
-    def phonenumberfield_config(self, field, key):
-        return '+49 351 3296645'

tests/functional/catalogue/review_tests.py

@@ -1,6 +1,5 @@
 from oscar.test.testcases import WebTestCase
 from oscar.test.factories import create_product, UserFactory
-from oscar.core.compat import get_user_model
 from oscar.apps.catalogue.reviews.signals import review_added
 from oscar.test.contextmanagers import mock_signal_receiver
 

tests/functional/checkout/guest_checkout_tests.py

@@ -444,6 +444,7 @@ class TestPaymentDetailsWithPreview(CheckoutMixin, WebTestCase):
         form.action = reverse('checkout:payment-details')
         self.assertEqual(form.submit(status="*").status_code, http_client.BAD_REQUEST)
 
+
 @override_settings(OSCAR_ALLOW_ANON_CHECKOUT=True)
 class TestPlacingOrder(CheckoutMixin, WebTestCase):
     is_anonymous = True

tests/functional/customer/alert_tests.py

@@ -39,16 +39,15 @@ class TestAUserWithAnActiveStockAlert(WebTest):
         self.assertEqual(1, len(alerts))
         alert = alerts[0]
         self.assertFalse(alert.is_cancelled)
-        self.app.get(reverse('customer:alerts-cancel-by-pk',
-                             kwargs={'pk': alert.pk}),
-                             user=self.user)
+        self.app.get(
+            reverse('customer:alerts-cancel-by-pk', kwargs={'pk': alert.pk}),
+            user=self.user)
 
         alerts = ProductAlert.objects.filter(user=self.user)
         self.assertEqual(1, len(alerts))
         alert = alerts[0]
         self.assertTrue(alert.is_cancelled)
 
-
     def test_gets_notified_when_it_is_back_in_stock(self):
         self.stockrecord.num_in_stock = 10
         self.stockrecord.save()

tests/functional/customer/history_tests.py

@@ -5,7 +5,7 @@ from django.http import HttpRequest
 
 from oscar.test.factories import create_product
 from oscar.core.compat import get_user_model
-from oscar.apps.customer  import history
+from oscar.apps.customer import history
 from oscar.templatetags.history_tags import get_back_button
 
 

tests/functional/customer/profile_tests.py

@@ -142,7 +142,7 @@ class TestASignedInUser(WebTestCase):
 
         order_history_page = self.app.get(
             reverse('customer:order', args=[self.order.number]),
-                    user=self.user)
+            user=self.user)
         form = order_history_page.forms['order_form_%d' % self.order.id]
         form.submit()
 

tests/functional/dashboard/catalogue_tests.py

@@ -23,7 +23,7 @@ class TestCatalogueViews(WebTestCase):
                 reverse('dashboard:stock-alert-list')]
         for url in urls:
             self.assertIsOk(self.get(url))
-    
+
     def test_upc_filter(self):
         product1 = create_product(upc='123')
         product2 = create_product(upc='12')

tests/functional/dashboard/category_tests.py

@@ -34,9 +34,9 @@ class TestCategoryDashboard(WebTestCase):
         form['_position'] = 'left'
         form['_ref_node_id'] = c.id
         response = form.submit()
-        self.assertRedirects(response,
-                             reverse('dashboard:catalogue-category-detail-list',
-                                    args=(b.pk,)))
+        self.assertRedirects(
+            response,
+            reverse('dashboard:catalogue-category-detail-list', args=(b.pk,)))
 
     def test_handles_invalid_form_gracefully(self):
         dashboard_index = self.app.get(reverse('dashboard:index'),

tests/functional/dashboard/dashboard_tests.py

@@ -30,8 +30,9 @@ class TestDashboardIndexForStaffUser(WebTestCase):
     def test_includes_hourly_report_with_no_orders(self):
         report = IndexView().get_hourly_report()
         self.assertEqual(len(report), 3)
-        for i, j in zip(sorted(report.keys()),
-                ['max_revenue', 'order_total_hourly', 'y_range']):
+
+        keys = ['max_revenue', 'order_total_hourly', 'y_range']
+        for i, j in zip(sorted(report.keys()), keys):
             self.assertEqual(i, j)
 
         self.assertEqual(len(report['order_total_hourly']), 12)

tests/functional/dashboard/order_tests.py

@@ -196,7 +196,6 @@ class TestOrderListSearch(WebTestCase):
         ),
     ]
 
-
     def test_search_filter_descriptions(self):
         SourceTypeFactory(name='Visa', code='visa')
         url = reverse('dashboard:order-list')

tests/functional/dashboard/product_tests.py

@@ -82,8 +82,7 @@ class TestCreateParentProduct(ProductWebTest):
 
     def test_requires_a_category(self):
         response = self.submit(title="Nice T-Shirt")
-        self.assertContains(response,
-            "must have at least one category")
+        self.assertContains(response, "must have at least one category")
         self.assertEqual(Product.objects.count(), 0)
 
     def test_for_smoke(self):

tests/functional/dashboard/promotion_tests.py

@@ -7,11 +7,12 @@ class ViewTests(WebTestCase):
     is_staff = True
 
     def test_pages_exist(self):
-        urls = [reverse('dashboard:promotion-list'),
-                reverse('dashboard:promotion-create-rawhtml'),
-                reverse('dashboard:promotion-create-singleproduct'),
-                reverse('dashboard:promotion-create-image'),
-               ]
+        urls = [
+            reverse('dashboard:promotion-list'),
+            reverse('dashboard:promotion-create-rawhtml'),
+            reverse('dashboard:promotion-create-singleproduct'),
+            reverse('dashboard:promotion-create-image'),
+        ]
         for url in urls:
             self.assertIsOk(self.get(url))
 

tests/integration/address/form_tests.py

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

tests/integration/auth_tests.py

@@ -26,7 +26,8 @@ class TestEmailAuthBackend(TestCase):
             'user1', email, password=password)
 
         for email_variation in [
-            'Person@example.com', 'Person@EXAMPLE.COM', 'person@Example.com']:
+            'Person@example.com', 'Person@EXAMPLE.COM', 'person@Example.com'
+        ]:
             user = authenticate(username=email_variation, password=password)
             self.assertEqual(user, created_user)
 

tests/integration/basket/model_tests.py

@@ -118,7 +118,6 @@ class TestANonEmptyBasket(TestCase):
                     return prices.Unavailable()
                 return super(UnavailableProductStrategy, self).pricing_policy(product, stockrecord)
 
-
         try:
             self.basket.strategy = UnavailableProductStrategy()
             self.assertEqual(self.basket.all_lines()[1].get_warning(), u"'D\xf9\uff4d\u03fb\u03d2 title' is no longer available")

tests/integration/basket/view_tests.py

@@ -4,7 +4,6 @@ from django.utils import six
 
 from oscar.apps.basket import views
 from oscar.test.factories import BasketFactory, VoucherFactory
-from oscar.test.utils import RequestFactory
 
 
 class TestVoucherAddView(TestCase):

tests/integration/catalogue/product_image_tests.py

@@ -7,8 +7,8 @@ class TestProductImages(TestCase):
 
     def test_images_are_in_consecutive_order(self):
         product = factories.create_product()
-        images = [factories.create_product_image(
-                  product=product, display_order=i) for i in range(4)]
+        for i in range(4):
+            factories.create_product_image(product=product, display_order=i)
 
         product.images.all()[2].delete()
 

tests/integration/dashboard/__init__.py

@@ -1 +1 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-

tests/integration/dashboard/nav_tests.py

@@ -25,6 +25,3 @@ class TestCategory(TestCase):
     def test_non_staff_user_has_empty_menu(self):
         menu = get_nodes(self.non_staff_user)
         self.assertEqual(menu, [])
-
-
-

tests/integration/partner/test_dashboard_views.py

@@ -2,7 +2,6 @@ from django.contrib.auth.models import Permission
 from django.test import TestCase
 from django.contrib.contenttypes.models import ContentType
 
-from oscar.core.loading import get_model
 from oscar.test.factories import PartnerFactory, PermissionFactory, UserFactory
 from oscar.apps.dashboard.partners import views
 

tests/integration/shipping/model_method_tests.py

@@ -55,7 +55,7 @@ class TestOrderAndItemCharges(TestCase):
 
         charge = self.method.calculate(basket)
 
-        self.assertEqual(D('5.00') + 7*D('1.00'), charge.incl_tax)
+        self.assertEqual(D('5.00') + 7 * D('1.00'), charge.incl_tax)
 
 
 class ZeroFreeThresholdTest(TestCase):

tests/integration/shipping/scales_tests.py

@@ -55,7 +55,7 @@ class TestScales(TestCase):
             basket.add(product, quantity=quantity)
 
         scale = Scale(attribute_code='weight')
-        self.assertEqual(1*3 + 2*4, scale.weigh_basket(basket))
+        self.assertEqual(1 * 3 + 2 * 4, scale.weigh_basket(basket))
 
     def test_decimals(self):
         basket = factories.create_basket(empty=True)

tests/integration/templatetags/test_currency_filters.py

@@ -39,4 +39,4 @@ class TestCurrencyFilter(TestCase):
         with translation.override(None, deactivate=True):
             self.template.render(template.Context({
                 'price': D('10.23'),
-            }))
+            }))

tests/unit/address/model_tests.py

@@ -37,76 +37,86 @@ class TestUserAddress(TestCase):
         self.assertEqual("Barrington", a.salutation)
 
     def test_has_name_property(self):
-        a = factories.UserAddressFactory.build(country=self.country,
-                first_name='Barry',
-                last_name='Barrington',
-                user=self.user)
+        a = factories.UserAddressFactory.build(
+            country=self.country,
+            first_name='Barry',
+            last_name='Barrington',
+            user=self.user)
         self.assertEqual("Barry Barrington", a.name)
 
     def test_has_summary_property(self):
         c = factories.CountryFactory.build(name='')
-        a = factories.UserAddressFactory(country=c,
-                title='Dr',
-                first_name='Barry',
-                last_name='Barrington',
-                line1='1 King Road',
-                line4='London',
-                postcode='SW1 9RE')
-        self.assertEqual("Dr Barry Barrington, 1 King Road, London, SW1 9RE, UNITED KINGDOM",
-                          a.summary)
+        a = factories.UserAddressFactory(
+            country=c,
+            title='Dr',
+            first_name='Barry',
+            last_name='Barrington',
+            line1='1 King Road',
+            line4='London',
+            postcode='SW1 9RE')
+        self.assertEqual(
+            "Dr Barry Barrington, 1 King Road, London, SW1 9RE, UNITED KINGDOM",
+            a.summary)
 
     def test_summary_includes_country(self):
         c = factories.CountryFactory.build(name='UNITED KINGDOM')
-        a = factories.UserAddressFactory.build(country=c,
-                title='Dr',
-                first_name='Barry',
-                last_name='Barrington',
-                line1='1 King Road',
-                line4='London',
-                postcode='SW1 9RE',
-                user=self.user)
+        a = factories.UserAddressFactory.build(
+            country=c,
+            title='Dr',
+            first_name='Barry',
+            last_name='Barrington',
+            line1='1 King Road',
+            line4='London',
+            postcode='SW1 9RE',
+            user=self.user)
         self.assertEqual(
             "Dr Barry Barrington, 1 King Road, London, SW1 9RE, UNITED KINGDOM",
             a.summary)
 
     def test_can_be_hashed(self):
-        a = factories.UserAddressFactory.build(country=self.country,
+        a = factories.UserAddressFactory.build(
+            country=self.country,
             user=self.user)
         hash = a.generate_hash()
         self.assertTrue(hash is not None)
 
     def test_can_be_hashed_including_non_ascii(self):
-        a = factories.UserAddressFactory.build(first_name=u"\u0141ukasz Smith",
-                last_name=u'Smith',
-                line1=u"75 Smith Road",
-                postcode=u"n4 8ty",
-                country=self.country,
-                user=self.user)
+        a = factories.UserAddressFactory.build(
+            first_name=u"\u0141ukasz Smith",
+            last_name=u'Smith',
+            line1=u"75 Smith Road",
+            postcode=u"n4 8ty",
+            country=self.country,
+            user=self.user)
         hash = a.generate_hash()
         self.assertTrue(hash is not None)
 
     def test_strips_whitespace_in_name_property(self):
-        a = factories.UserAddressFactory.build(first_name='',
+        a = factories.UserAddressFactory.build(
+            first_name='',
             last_name='Barrington',
             country=self.country,
             user=self.user)
         self.assertEqual("Barrington", a.name)
 
     def test_uses_city_as_an_alias_of_line4(self):
-        a = factories.UserAddressFactory.build(line4='London',
+        a = factories.UserAddressFactory.build(
+            line4='London',
             country=self.country,
             user=self.user)
         self.assertEqual('London', a.city)
 
     def test_converts_postcode_to_uppercase_when_cleaning(self):
-        address = factories.UserAddressFactory.build(postcode="n4 8ty",
+        address = factories.UserAddressFactory.build(
+            postcode="n4 8ty",
             country=self.country,
             user=self.user)
         address.clean()
         self.assertEqual("N4 8TY", address.postcode)
 
     def test_strips_whitespace_when_cleaning(self):
-        a = factories.UserAddressFactory.build(line1="  75 Smith Road  ",
+        a = factories.UserAddressFactory.build(
+            line1="  75 Smith Road  ",
             postcode="  n4 8ty",
             country=self.country,
             user=self.user)
@@ -115,7 +125,8 @@ class TestUserAddress(TestCase):
         self.assertEqual("75 Smith Road", a.line1)
 
     def test_active_address_fields_skips_whitespace_only_fields(self):
-        a = factories.UserAddressFactory.build(first_name='   ',
+        a = factories.UserAddressFactory.build(
+            first_name='   ',
             last_name='Barrington',
             line1='  75 Smith Road  ',
             postcode='  n4 8ty',
@@ -126,12 +137,14 @@ class TestUserAddress(TestCase):
         self.assertEqual("Barrington", active_fields[0])
 
     def test_ignores_whitespace_when_hashing(self):
-        a1 = factories.UserAddressFactory.build(first_name='Terry',
+        a1 = factories.UserAddressFactory.build(
+            first_name='Terry',
             last_name='Barrington',
             country=self.country,
             user=self.user)
         a1.clean()
-        a2 = factories.UserAddressFactory.build(first_name='   Terry  ',
+        a2 = factories.UserAddressFactory.build(
+            first_name='   Terry  ',
             last_name='     Barrington',
             country=self.country,
             user=self.user)
@@ -139,7 +152,8 @@ class TestUserAddress(TestCase):
         self.assertEqual(a1.generate_hash(), a2.generate_hash())
 
     def test_populate_shipping_address_doesnt_set_id(self):
-        a = factories.UserAddressFactory.build(country=self.country,
+        a = factories.UserAddressFactory.build(
+            country=self.country,
             user=self.user)
         a.clean()
         sa = ShippingAddress()
@@ -147,7 +161,8 @@ class TestUserAddress(TestCase):
         self.assertIsNone(sa.id)
 
     def test_populated_shipping_address_has_same_summary_user_address(self):
-        a = factories.UserAddressFactory.build(country=self.country,
+        a = factories.UserAddressFactory.build(
+            country=self.country,
             user=self.user)
         a.clean()
         sa = ShippingAddress()
@@ -155,7 +170,8 @@ class TestUserAddress(TestCase):
         self.assertEqual(sa.summary, a.summary)
 
     def test_summary_is_property(self):
-        a = factories.UserAddressFactory.build(title='',
+        a = factories.UserAddressFactory.build(
+            title='',
             line4='',
             first_name=" Terry  ",
             last_name='Barrington',

tests/unit/basket/middleware_tests.py

@@ -31,4 +31,4 @@ class TestBasketMiddleware(TestCase):
         cookie_basket = self.middleware.get_cookie_basket("oscar_open_basket", request, None)
 
         self.assertEqual(None, cookie_basket)
-        self.assertIn("oscar_open_basket", request.cookies_to_delete)
+        self.assertIn("oscar_open_basket", request.cookies_to_delete)

tests/unit/catalogue/test_product_search_handler_setting.py

@@ -5,6 +5,7 @@ from oscar.apps.catalogue.search_handlers import (
     get_product_search_handler_class,
 )
 
+
 class TestSearchHandler(object):
     pass
 

tests/unit/checkout/calculator_tests.py

@@ -4,7 +4,6 @@ from django.test import TestCase
 import mock
 
 from oscar.apps.checkout import calculators
-from oscar.apps.shipping import methods
 from oscar.core import prices
 
 

tests/unit/checkout/forms_tests.py

@@ -66,4 +66,3 @@ class TestShippingAddressForm(TestCase):
 
         data['country'] = Country.objects.get(iso_3166_1_a2='GB').pk
         self.assertTrue(ShippingAddressForm(data).is_valid())
-

tests/unit/core/autoslugfield_tests.py

@@ -225,4 +225,3 @@ class AutoSlugFieldTest(TestCase):
             else:
                 self.fail("Could not exec %r: %s" % (string.strip(), e))
         return l
-

tests/unit/core/customisation_tests.py

@@ -57,7 +57,8 @@ class TestForkAppFunction(TestCase):
         for module, expected_string in [
             ('models', 'from oscar.apps.order.models import *'),
             ('admin', 'from oscar.apps.order.admin import *'),
-            ('config', 'OrderConfig')]:
+            ('config', 'OrderConfig')
+        ]:
             filepath = os.path.join(self.tmp_folder, 'order', '%s.py' % module)
             self.assertTrue(os.path.exists(filepath))
 
@@ -70,4 +71,3 @@ class TestForkAppFunction(TestCase):
             native_migration_path = os.path.join(
                 self.tmp_folder, app, 'migrations')
             self.assertEqual(has_models, os.path.exists(native_migration_path))
-

tests/unit/core/loading_tests.py

@@ -133,8 +133,8 @@ class TestOverridingCoreApps(TestCase):
 
     def test_means_the_overriding_model_is_registered_first(self):
         klass = get_model('partner', 'StockRecord')
-        self.assertEqual('tests._site.apps.partner.models',
-                          klass.__module__)
+        self.assertEqual(
+            'tests._site.apps.partner.models', klass.__module__)
 
 
 class TestAppLabelsForModels(TestCase):
@@ -145,7 +145,7 @@ class TestAppLabelsForModels(TestCase):
         missing = []
         for model in models:
             # Ignore non-Oscar models
-            if not 'oscar' in repr(model):
+            if 'oscar' not in repr(model):
                 continue
             # Don't know how to get the actual model's Meta class. But if
             # the parent doesn't have a Meta class, it's doesn't have an

tests/unit/core/phonenumber_tests.py

@@ -1,4 +1,4 @@
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 from django.test.testcases import TestCase
 from django.db import models
 from django import forms
@@ -33,7 +33,7 @@ equal_number_strings = ['+44 113 8921113', '+441138921113']
 local_numbers = [
     ('GB', '01606 751 78'),
     ('DE', '0176/96842671'),
-    ]
+]
 invalid_numbers = ['+44 113 892111', ]
 
 

tests/unit/core/prices_tests.py

@@ -19,10 +19,10 @@ class TestPriceObject(TestCase):
 
     def test_price_equals_reflexivity(self):
         for price in (
-            Price(currency='USD', excl_tax=D('10.00')), 
+            Price(currency='USD', excl_tax=D('10.00')),
             Price(currency='USD', excl_tax=D('10.00'), tax=D('2.00')),
             Price(currency='USD', excl_tax=D('10.00'), incl_tax=D('12.00')),
-            ):
+        ):
             self.assertEqual(price, price)
 
     def test_price_equals_formats(self):
@@ -34,7 +34,7 @@ class TestPriceObject(TestCase):
         price1 = Price(currency='EUR', excl_tax=D('10.00'), tax=D('2.00'))
         price2 = Price(currency='USD', excl_tax=D('10.00'), tax=D('2.00'))
         self.assertNotEqual(price1, price2)
-        
+
     def test_price_equals_transitivity(self):
         prices = (
             Price(currency='EUR', excl_tax=D('10.00'), tax=D('2.00')),

tests/unit/dashboard/order_form_tests.py

@@ -9,8 +9,10 @@ from oscar.apps.dashboard.orders import forms
 class TestOrderStatsForm(TestCase):
 
     def test_returns_inclusive_date_filters(self):
-        data = {'date_from': '2012-08-03',
-                'date_to': '2012-08-03',}
+        data = {
+            'date_from': '2012-08-03',
+            'date_to': '2012-08-03'
+        }
         form = forms.OrderStatsForm(data)
         self.assertTrue(form.is_valid())
         filters = form.get_filters()

tests/unit/forms/widget_tests.py

@@ -19,4 +19,4 @@ class TestWidgetsDatetimeFormat(TestCase):
             ('%H:%M', 'hh:ii'),
         )
         for format_, expected in format_testcases:
-            self.assertEqual(widgets.datetime_format_to_js_time_format(format_), expected)
+            self.assertEqual(widgets.datetime_format_to_js_time_format(format_), expected)

tests/unit/logging_tests.py

@@ -22,4 +22,4 @@ class TestLogging(TestCase):
             record = LogRecord(
                 name=None, level=None, pathname='', lineno=0,
                 msg=string, args=None, exc_info=None)
-            self.assertEqual(formatter.format(record), expected)
+            self.assertEqual(formatter.format(record), expected)

tests/unit/offer/condition_tests.py

@@ -54,4 +54,3 @@ class TestCustomCondition(TestCase):
     def test_is_satified_by_match(self):
         self.basket.owner = factories.UserFactory(first_name="Barry")
         self.assertTrue(self.offer.is_condition_satisfied(self.basket))
-

tests/unit/order/processing_tests.py

@@ -6,8 +6,6 @@ import six
 
 from oscar.apps.order import processing
 from oscar.apps.order import exceptions
-from oscar.apps.order.models import Line
-from oscar.test.factories import create_order
 
 
 class TestValidatePaymentEvent(TestCase):
@@ -50,7 +48,6 @@ class TestValidatePaymentEvent(TestCase):
         order = mock.Mock()
         lines = None
         line_quantities = None
-        out = self.event_handler.validate_payment_event(order, 'payment',
-                                                  D('10.00'), lines,
-                                                  line_quantities)
+        out = self.event_handler.validate_payment_event(
+            order, 'payment', D('10.00'), lines, line_quantities)
         self.assertIsNone(out)

tests/unit/partner/model_tests.py

@@ -25,7 +25,7 @@ class TestStockRecord(TestCase):
 
     def test_net_stock_level_with_allocation(self):
         self.stockrecord.allocate(5)
-        self.assertEqual(10-5, self.stockrecord.net_stock_level)
+        self.assertEqual(10 - 5, self.stockrecord.net_stock_level)
 
     def test_allocated_does_not_alter_num_in_stock(self):
         self.stockrecord.allocate(5)

tests/unit/payment/bankcard_tests.py

@@ -30,11 +30,11 @@ class TestBankCardValidation(TestCase):
             for number in numbers:
                 sniffed_bankcard_type = bankcards.bankcard_type(number)
                 self.assertEqual(expected_bankcard_type, sniffed_bankcard_type)
-    
+
     def test_valid_numbers(self):
         for number in self.valid_numbers:
             self.assertTrue(bankcards.luhn(number))
-    
+
     def test_invalid_numbers(self):
         for number in self.invalid_numbers:
             self.assertFalse(bankcards.luhn(number))

tests/unit/payment/form_tests.py

@@ -6,10 +6,11 @@ from django.forms import ValidationError
 
 
 from oscar.apps.payment import forms, models
- # types=[bankcards.VISA, bankcards.VISA_ELECTRON, bankcards.MASTERCARD,
- #               bankcards.AMEX, bankcards.MAESTRO, bankcards.DINERS_CLUB,
- #               bankcards.DISCOVER, bankcards.JCB, bankcards.CHINA_UNIONPAY,
- #               bankcards.SOLO, bankcards.LASER, bankcards.SWITCH]
+# types=[bankcards.VISA, bankcards.VISA_ELECTRON, bankcards.MASTERCARD,
+#               bankcards.AMEX, bankcards.MAESTRO, bankcards.DINERS_CLUB,
+#               bankcards.DISCOVER, bankcards.JCB, bankcards.CHINA_UNIONPAY,
+#               bankcards.SOLO, bankcards.LASER, bankcards.SWITCH]
+
 
 class TestBankcardNumberField(TestCase):
 
@@ -26,16 +27,15 @@ class TestBankcardNumberField(TestCase):
 
     def test_amex_accepted_when_allowed(self):
         # Number taken from http://www.darkcoding.net/credit-card-numbers/
-        self.field = forms.BankcardNumberField(types=['American Express',])
+        self.field = forms.BankcardNumberField(types=['American Express'])
         self.assertEqual(
             '348934265521923', self.field.clean('348934265521923'))
 
     def test_amex_rejected_when_disallowed(self):
-        self.field = forms.BankcardNumberField(types=['Visa',])
+        self.field = forms.BankcardNumberField(types=['Visa'])
         with self.assertRaises(ValidationError):
             self.field.clean('348934265521923')
 
-
     def test_raises_error_for_invalid_card_type(self):
         with self.assertRaises(ImproperlyConfigured):
             self.field = forms.BankcardNumberField(types=['American Express', 'Nonsense'])
@@ -98,8 +98,7 @@ class TestExpiryMonthField(TestCase):
 
     def test_defaults_to_current_month(self):
         today = datetime.date.today()
-        self.assertEqual(["%.2d" % today.month, today.year],
-                          self.field.initial)
+        self.assertEqual(["%.2d" % today.month, today.year], self.field.initial)
 
 
 class TestOptionalExpiryMonthField(TestExpiryMonthField):
@@ -134,8 +133,8 @@ class TestCCVField(TestCase):
         try:
             self.field.clean("asdf")
         except ValidationError as e:
-            self.assertEqual("Please enter a 3 or 4 digit number",
-                              e.messages[0])
+            self.assertEqual(
+                "Please enter a 3 or 4 digit number", e.messages[0])
 
 
 class TestValidBankcardForm(TestCase):

tests/unit/promotion_tests.py

@@ -8,4 +8,3 @@ class PromotionTest(TestCase):
     def test_default_template_name(self):
         promotion = models.Image.objects.create(name="dummy banner")
         self.assertEqual('promotions/image.html', promotion.template_name())
-

tests/unit/search/munger_tests.py

@@ -59,6 +59,7 @@ SEARCH_FACETS = {
     ]),
 }
 
+
 @override_settings(OSCAR_SEARCH_FACETS=SEARCH_FACETS)
 class TestFacetMunger(TestCase):
 

tests/unit/shipping/discount_tests.py

@@ -65,4 +65,3 @@ class TestDiscountingMethodsWithTax(TestCase):
         basket = Basket()
         charge = self.method.calculate(basket)
         self.assertEqual(D('7.00'), charge.incl_tax)
-

tests/unit/utils_tests.py

@@ -6,23 +6,23 @@ from oscar.core.utils import compose
 class TestComposeFunction(TestCase):
 
     def test_composes_two_single_arg_functions(self):
-        double = lambda x: 2*x
-        triple = lambda x: 3*x
+        double = lambda x: 2 * x
+        triple = lambda x: 3 * x
 
         f = compose(double, triple)
-        self.assertEqual(f(2), 2*2*3)
+        self.assertEqual(f(2), 2 * 2 * 3)
 
     def test_composes_three_single_arg_functions(self):
-        double = lambda x: 2*x
-        triple = lambda x: 3*x
-        quadruple = lambda x: 4*x
+        double = lambda x: 2 * x
+        triple = lambda x: 3 * x
+        quadruple = lambda x: 4 * x
 
         f = compose(double, triple, quadruple)
-        self.assertEqual(f(2), 2*2*3*4)
+        self.assertEqual(f(2), 2 * 2 * 3 * 4)
 
     def test_composes_two_multi_arg_functions(self):
-        double = lambda x, y: (2*x, 2*y)
-        triple = lambda x, y: (3*x, 3*y)
+        double = lambda x, y: (2 * x, 2 * y)
+        triple = lambda x, y: (3 * x, 3 * y)
 
         f = compose(double, triple)
-        self.assertEqual(f(2, 4), (2*2*3, 4*2*3))
+        self.assertEqual(f(2, 4), (2 * 2 * 3, 4 * 2 * 3))