Merge remote-tracking branch 'remotes/origin/main'

.github/workflows/ci.yml

@@ -33,8 +33,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-        django-version: ["3.2"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        django-version: ["3.2", "4.2"]
         oscar-version: ["3.2"]
     steps:
       - name: Download src dir

oscarapi/middleware.py

@@ -5,7 +5,7 @@
 from django.contrib.sessions.middleware import SessionMiddleware
 from django.core.exceptions import PermissionDenied
 from django.http.response import HttpResponse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from oscar.core.loading import get_class
 

oscarapi/serializers/basket.py

@@ -2,7 +2,7 @@
 import logging
 from decimal import Decimal
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.contrib.auth import get_user_model
 from rest_framework import serializers
 

oscarapi/serializers/fields.py

@@ -7,7 +7,7 @@
 from urllib.error import HTTPError
 from django.conf import settings as django_settings
 from django.db import IntegrityError
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.files import File
 from django.utils.functional import cached_property

oscarapi/serializers/product.py

@@ -2,7 +2,7 @@
 
 import logging
 from copy import deepcopy
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from rest_framework import serializers
 from rest_framework.fields import empty

oscarapi/signals.py

@@ -1,3 +1,10 @@
+import django
 from django.dispatch import Signal
 
-oscarapi_post_checkout = Signal(providing_args=["order", "user", "request", "response"])
+
+oscarapi_post_checkout_args = ["order", "user", "request", "response"]
+
+if django.VERSION >= (3, 0):
+    oscarapi_post_checkout = Signal()
+else:
+    oscarapi_post_checkout = Signal(providing_args=oscarapi_post_checkout_args)

oscarapi/utils/categories.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from rest_framework.exceptions import NotFound
 

oscarapi/views/basket.py

@@ -1,5 +1,5 @@
 # pylint: disable=W0632
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from oscar.apps.basket import signals
 from oscar.core.loading import get_model, get_class