Replace local patch_settings decorator with Django's override_settings

It didn't exist when I wrote patch_settings but now there's not point
having two versions of the same thing.

oscar/test/__init__.py

@@ -1,5 +1,4 @@
 import httplib
-from contextlib import contextmanager
 
 from django.test import TestCase
 from django.test.client import Client
@@ -9,19 +8,6 @@ from django_webtest import WebTest
 from purl import URL
 
 
-@contextmanager
-def patch_settings(**kwargs):
-    from django.conf import settings
-    backup = {}
-    for key, value in kwargs.items():
-        if hasattr(settings, key):
-            backup[key] = getattr(settings, key)
-        setattr(settings, key, value)
-    yield
-    for key, value in backup.items():
-        setattr(settings, key, value)
-
-
 class ClientTestCase(TestCase):
     username = 'dummyuser'
     email = 'dummyuser@example.com'

tests/functional/checkout_tests.py

@@ -4,9 +4,10 @@ import sys
 from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.utils.importlib import import_module
+from django.test.utils import override_settings
 
 from oscar.test.helpers import create_product, create_voucher
-from oscar.test import ClientTestCase, patch_settings
+from oscar.test import ClientTestCase
 from oscar.apps.basket.models import Basket
 from oscar.apps.order.models import Order
 from oscar.apps.address.models import Country
@@ -92,14 +93,14 @@ class EnabledAnonymousCheckoutViewsTests(ClientTestCase, CheckoutMixin):
                                                  'quantity': 1})
 
     def test_shipping_address_does_require_session_email_address(self):
-        with patch_settings(OSCAR_ALLOW_ANON_CHECKOUT=True):
+        with override_settings(OSCAR_ALLOW_ANON_CHECKOUT=True):
             self.reload_urlconf()
             url = reverse('checkout:shipping-address')
             response = self.client.get(url)
             self.assertIsRedirect(response)
 
     def test_email_address_is_saved_with_order(self):
-        with patch_settings(OSCAR_ALLOW_ANON_CHECKOUT=True):
+        with override_settings(OSCAR_ALLOW_ANON_CHECKOUT=True):
             self.reload_urlconf()
             self.add_product_to_basket()
             self.complete_guest_email_form('barry@example.com')

tests/unit/core_tests.py

@@ -1,15 +1,14 @@
 from django.test import TestCase
 from django.core.exceptions import ValidationError
 from django.conf import settings
-
 from django.contrib.flatpages.models import FlatPage
+from django.test.utils import override_settings
 
 import oscar
 from oscar.core.loading import import_module, AppNotFoundError, \
         get_classes, get_class, ClassNotFoundError
 from oscar.core.validators import ExtendedURLValidator
 from oscar.core.validators import URLDoesNotExistValidator
-from oscar.test import patch_settings
 
 
 class TestImportModule(TestCase):
@@ -59,22 +58,22 @@ class ClassLoadingWithLocalOverrideTests(TestCase):
         self.installed_apps[self.installed_apps.index('oscar.apps.shipping')] = 'tests.site.shipping'
 
     def test_loading_class_defined_in_local_module(self):
-        with patch_settings(INSTALLED_APPS=self.installed_apps):
+        with override_settings(INSTALLED_APPS=self.installed_apps):
             (Free,) = get_classes('shipping.methods', ('Free',))
             self.assertEqual('tests.site.shipping.methods', Free.__module__)
 
     def test_loading_class_which_is_not_defined_in_local_module(self):
-        with patch_settings(INSTALLED_APPS=self.installed_apps):
+        with override_settings(INSTALLED_APPS=self.installed_apps):
             (FixedPrice,) = get_classes('shipping.methods', ('FixedPrice',))
             self.assertEqual('oscar.apps.shipping.methods', FixedPrice.__module__)
 
     def test_loading_class_from_module_not_defined_in_local_app(self):
-        with patch_settings(INSTALLED_APPS=self.installed_apps):
+        with override_settings(INSTALLED_APPS=self.installed_apps):
             (Repository,) = get_classes('shipping.repository', ('Repository',))
             self.assertEqual('oscar.apps.shipping.repository', Repository.__module__)
 
     def test_loading_classes_defined_in_both_local_and_oscar_modules(self):
-        with patch_settings(INSTALLED_APPS=self.installed_apps):
+        with override_settings(INSTALLED_APPS=self.installed_apps):
             (Free, FixedPrice) = get_classes('shipping.methods', ('Free', 'FixedPrice'))
             self.assertEqual('tests.site.shipping.methods', Free.__module__)
             self.assertEqual('oscar.apps.shipping.methods', FixedPrice.__module__)
@@ -142,7 +141,7 @@ class ClassLoadingWithLocalOverrideWithMultipleSegmentsTests(TestCase):
         self.installed_apps[self.installed_apps.index('oscar.apps.shipping')] = 'tests.site.apps.shipping'
 
     def test_loading_class_defined_in_local_module(self):
-        with patch_settings(INSTALLED_APPS=self.installed_apps):
+        with override_settings(INSTALLED_APPS=self.installed_apps):
             (Free,) = get_classes('shipping.methods', ('Free',))
             self.assertEqual('tests.site.apps.shipping.methods', Free.__module__)
 

tests/unit/order/creator_tests.py

@@ -1,13 +1,13 @@
 from decimal import Decimal as D
 
 from django.test import TestCase
+from django.test.utils import override_settings
 from mock import Mock
 
 from oscar.apps.basket.models import Basket
 from oscar.apps.order.models import Order
 from oscar.test.helpers import create_product
 from oscar.apps.order.utils import OrderCreator
-from oscar.test import patch_settings
 
 
 class TestOrderCreatorErrorCases(TestCase):
@@ -69,14 +69,14 @@ class TestSuccessfulOrderCreation(TestCase):
 
     def test_uses_default_order_status_from_settings(self):
         self.basket.add_product(create_product(price=D('12.00')))
-        with patch_settings(OSCAR_INITIAL_ORDER_STATUS='A'):
+        with override_settings(OSCAR_INITIAL_ORDER_STATUS='A'):
             self.creator.place_order(basket=self.basket, order_number='1234')
         order = Order.objects.get(number='1234')
         self.assertEqual('A', order.status)
 
     def test_uses_default_line_status_from_settings(self):
         self.basket.add_product(create_product(price=D('12.00')))
-        with patch_settings(OSCAR_INITIAL_LINE_STATUS='A'):
+        with override_settings(OSCAR_INITIAL_LINE_STATUS='A'):
             self.creator.place_order(basket=self.basket, order_number='1234')
         order = Order.objects.get(number='1234')
         line = order.lines.all()[0]