Browse Source

Fixes for deprecations in Django 3.2:

- Replace use of deprecated `request.is_ajax()` with equivalent.
- Replace use of `imp.reload` with `importlib.reload`
master
Samir Shah 4 years ago
parent
commit
76aeb45bdb

+ 2
- 2
src/oscar/apps/basket/views.py View File

@@ -186,7 +186,7 @@ class BasketView(ModelFormSetView):
186 186
             response = super().formset_valid(formset)
187 187
 
188 188
         # If AJAX submission, don't redirect but reload the basket content HTML
189
-        if self.request.is_ajax():
189
+        if self.request.headers.get('x-requested-with') == 'XMLHttpRequest':
190 190
             # Reload basket and apply offers again
191 191
             self.request.basket = get_model('basket', 'Basket').objects.get(
192 192
                 id=self.request.basket.id)
@@ -247,7 +247,7 @@ class BasketView(ModelFormSetView):
247 247
             "Your basket has got some issues. "
248 248
             "Please correct any validation errors below."))
249 249
 
250
-        if self.request.is_ajax():
250
+        if self.request.headers.get('x-requested-with') == 'XMLHttpRequest':
251 251
             ctx = self.get_context_data(formset=formset,
252 252
                                         basket=self.request.basket)
253 253
             return self.json_response(ctx, flash_messages)

+ 1
- 2
tests/functional/checkout/test_guest_checkout.py View File

@@ -1,7 +1,6 @@
1 1
 import sys
2 2
 from http import client as http_client
3
-from imp import reload
4
-from importlib import import_module
3
+from importlib import import_module, reload
5 4
 from unittest import mock
6 5
 from urllib.parse import quote
7 6
 

+ 1
- 1
tests/settings.py View File

@@ -169,7 +169,7 @@ OSCAR_INITIAL_LINE_STATUS = 'a'
169 169
 OSCAR_LINE_STATUS_PIPELINE = {'a': ('b', ), 'b': ()}
170 170
 
171 171
 SECRET_KEY = 'notverysecret'
172
-# Deprecated in Django 4.0, then we need to update the hashes to SHA-256 in tests/integration/order/test_models.py
172
+# Removed in Django 4.0, then we need to update the hashes to SHA-256 in tests/integration/order/test_models.py
173 173
 DEFAULT_HASHING_ALGORITHM = 'sha1'
174 174
 TEST_RUNNER = 'django.test.runner.DiscoverRunner'
175 175
 FIXTURE_DIRS = [location('unit/fixtures')]

Loading…
Cancel
Save